steps towards Android

android/settings.gradle

@@ -1,3 +1,5 @@
 include ':app'
 include ':shared_io'
 project(':shared_io').projectDir = new File('../java_console/shared_io')
+include ':io'
+project(':io').projectDir = new File('../java_console/io')

java_console/build.xml

@@ -47,7 +47,8 @@
             <src path="io/src/main/java"/>
             <src path="io/src/test/java"/>
             <src path="models/src"/>
-            <src path="inifile/src"/>
+            <src path="inifile/src/main/java"/>
+            <src path="inifile/src/test/java"/>
             <src path="shared_ui/src"/>
             <src path="shared_io/src/main/java"/>
             <src path="logging-api/src/main/java"/>
@@ -80,6 +81,7 @@
                 <fileset dir="autotest/src" includes="**/test/**/*Test.java"/>
                 <fileset dir="autoupdate/src" includes="**/test/**/*Test.java"/>
                 <fileset dir="io/src/test/java" includes="**/test/**/*Test.java"/>
+                <fileset dir="inifile/src/test/java" includes="**/test/**/*Test.java"/>
                 <fileset dir="models/src" includes="**/test/**/*Test.java"/>
                 <fileset dir="ui/src/test/java" includes="**/*Test.java"/>
                 <fileset dir="romraider/src" includes="**/test/**/*Test.java"/>

java_console/inifile/inifile.iml

@@ -3,7 +3,8 @@
   <component name="NewModuleRootManager" inherit-compiler-output="true">
     <exclude-output />
     <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />

java_console/inifile/src/main/java/com/opensr5/ini/IniFileModel.java

@@ -95,7 +95,7 @@ public class IniFileModel {
 
     private void handleLine(RawIniFile.Line line) {
 
-        String rawTest = line.getRawText();
+        String rawText = line.getRawText();
         try {
             LinkedList<String> list = new LinkedList<>(Arrays.asList(line.getTokens()));
 
@@ -107,19 +107,19 @@ public class IniFileModel {
             // todo: use TSProjectConsumer constant
             if (isInSettingContextHelp) {
                 // todo: use TSProjectConsumer constant
-                if (rawTest.contains("SettingContextHelpEnd")) {
+                if (rawText.contains("SettingContextHelpEnd")) {
                     isInSettingContextHelp = false;
                 }
                 if (list.size() == 2)
                     tooltips.put(list.get(0), list.get(1));
                 return;
-            } else if (rawTest.contains("SettingContextHelp")) {
+            } else if (rawText.contains("SettingContextHelp")) {
                 isInsidePageDefinition = false;
                 isInSettingContextHelp = true;
                 return;
             }
 
-            if (RawIniFile.Line.isCommentLine(rawTest))
+            if (RawIniFile.Line.isCommentLine(rawText))
                 return;
 
             trim(list);
@@ -140,7 +140,7 @@ public class IniFileModel {
                 handleField(list);
             }
         } catch (RuntimeException e) {
-            throw new IllegalStateException("While [" + rawTest + "]", e);
+            throw new IllegalStateException("While [" + rawText + "]", e);
         }
     }
 

java_console/io/build.gradle

@@ -0,0 +1,7 @@
+plugins {
+    id 'java'
+}
+
+dependencies {
+    implementation project(':logging-api')
+}