Skip to content

Commit 76d81b2

Browse files
committed
fixup whitespace after rebase
Using the documented tip from .editorconfig: IntelliJ IDEA has Settings->Editor->General->Strip trailing spaces on Save that can be set to "Modified Lines" which sometimes works properly
1 parent 4c14b84 commit 76d81b2

1 file changed

Lines changed: 17 additions & 18 deletions

File tree

core/src/com/biglybt/core/util/NetUtils.java

Lines changed: 17 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@
5959
{
6060
return( getNetworkInterfaces( false ));
6161
}
62-
62+
6363
public static List<NetworkInterface>
6464
getNetworkInterfaces(
6565
boolean up_only )
@@ -133,22 +133,22 @@
133133
Debug.out( "Network interface enumeration took " + elapsed_millis + ": " + (old_period<current_check_millis?"increased":"decreased" ) + " refresh frequency to " + current_check_millis + "ms" );
134134
}
135135
*/
136-
136+
137137
if ( nis != null ){
138138

139139
while( nis.hasMoreElements()){
140140

141141
NetworkInterface ni = nis.nextElement();
142-
142+
143143
result_all.add( ni );
144-
144+
145145
try{
146146
if ( ni.isUp()){
147-
147+
148148
result_up.add( ni );
149149
}
150150
}catch( Throwable e ){
151-
151+
152152
}
153153
}
154154
}
@@ -178,12 +178,12 @@
178178
check_in_progress = false;
179179
current_all_interfaces = result_all;
180180
current_up_interfaces = result_up;
181-
181+
182182
last_ni_check = SystemTime.getMonotonousTime();
183183

184184
try{
185185
changed = SESecurityManager.filterNetworkInterfaces( result_all );
186-
186+
187187
}catch( Throwable e ){
188188

189189
Debug.out( e );
@@ -640,32 +640,31 @@ private static void collectNetworkInterfacesByName(List<NetworkInterface> list)
640640
}
641641
}
642642
}
643-
643+
644644
public static List<String>
645645
getTestDomains()
646646
{
647647
List<String> result = new ArrayList<>();
648-
648+
649649
try{
650650
String domains = COConfigurationManager.getStringParameter( ConfigKeys.Connection.SCFG_CONNECTION_TEST_DOMAIN );
651-
651+
652652
String[] bits = domains.split("[,;]");
653-
653+
654654
for ( String bit: bits ){
655-
655+
656656
bit = bit.trim();
657-
657+
658658
if ( !bit.isEmpty()){
659-
659+
660660
result.add( bit );
661661
}
662662
}
663663
}catch( Throwable e ){
664-
664+
665665
Debug.out( e );
666666
}
667-
667+
668668
return( result );
669669
}
670-
671670
}

0 commit comments

Comments
 (0)