diff --git a/fml/.gitignore b/fml/.gitignore index 1b1508178..fad6f31b4 100644 --- a/fml/.gitignore +++ b/fml/.gitignore @@ -4,3 +4,5 @@ /fmlbuild.properties /difflist.txt /.metadata/ +/eclipse/.metadata/ +/target diff --git a/fml/eclipse/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.core.resources.prefs b/fml/eclipse/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.core.resources.prefs index 466d7f93a..a469f5d3d 100644 --- a/fml/eclipse/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.core.resources.prefs +++ b/fml/eclipse/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.core.resources.prefs @@ -1,4 +1,3 @@ -#Sun Jun 05 18:58:07 CEST 2011 -version=1 eclipse.preferences.version=1 refresh.enabled=true +version=1 diff --git a/fml/eclipse/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.debug.ui.prefs b/fml/eclipse/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.debug.ui.prefs index b570e7c25..36f678f75 100644 --- a/fml/eclipse/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.debug.ui.prefs +++ b/fml/eclipse/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.debug.ui.prefs @@ -4,5 +4,7 @@ eclipse.preferences.version=1 org.eclipse.debug.ui.PREF_LAUNCH_PERSPECTIVES=\n\n org.eclipse.debug.ui.UseContextualLaunch=false org.eclipse.debug.ui.user_view_bindings=\r\n\r\n\r\n\r\n\r\n\r\n +org.eclipse.debug.uiinspectPopupSashWeights=750\:250 pref_state_memento.org.eclipse.debug.ui.DebugVieworg.eclipse.debug.ui.DebugView=\r\n +preferredDetailPanes=DefaultDetailPane\:DefaultDetailPane| preferredTargets=default\:default|default,org.eclipse.cdt.debug.ui.toggleCBreakpointTarget\:default|org.eclipse.cdt.debug.ui.toggleCBreakpointTarget\:org.eclipse.cdt.debug.ui.toggleCBreakpointTarget| diff --git a/fml/eclipse/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.jdt.ui.prefs b/fml/eclipse/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.jdt.ui.prefs index d3936e4a7..c3f07c424 100644 --- a/fml/eclipse/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.jdt.ui.prefs +++ b/fml/eclipse/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.jdt.ui.prefs @@ -1,5 +1,5 @@ content_assist_favorite_static_members= -content_assist_lru_history= +content_assist_lru_history= content_assist_number_of_computers=13 content_assist_proposals_background=255,255,255 content_assist_proposals_foreground=0,0,0 diff --git a/fml/eclipse/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.ui.editors.prefs b/fml/eclipse/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.ui.editors.prefs index 316ef6f30..d7814e3af 100644 --- a/fml/eclipse/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.ui.editors.prefs +++ b/fml/eclipse/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.ui.editors.prefs @@ -1,4 +1,4 @@ -#Sun Jun 05 18:58:05 CEST 2011 -spacesForTabs=true eclipse.preferences.version=1 +lineNumberRuler=true overviewRuler_migration=migrated_3.1 +spacesForTabs=true diff --git a/fml/eclipse/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.ui.ide.prefs b/fml/eclipse/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.ui.ide.prefs index 34f7ac799..54c6b96bf 100644 --- a/fml/eclipse/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.ui.ide.prefs +++ b/fml/eclipse/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.ui.ide.prefs @@ -4,6 +4,6 @@ PROBLEMS_FILTERS_MIGRATE=true SAVE_ALL_BEFORE_BUILD=true TASKS_FILTERS_MIGRATE=true eclipse.preferences.version=1 -platformState=1333336227259 +platformState=1333336227263 quickStart=true tipsAndTricks=true diff --git a/fml/eclipse/.metadata/.plugins/org.eclipse.debug.ui/launchConfigurationHistory.xml b/fml/eclipse/.metadata/.plugins/org.eclipse.debug.ui/launchConfigurationHistory.xml index ae4022458..deec8137a 100644 --- a/fml/eclipse/.metadata/.plugins/org.eclipse.debug.ui/launchConfigurationHistory.xml +++ b/fml/eclipse/.metadata/.plugins/org.eclipse.debug.ui/launchConfigurationHistory.xml @@ -1,7 +1,9 @@ - + + + diff --git a/fml/eclipse/simpletestmod/.classpath b/fml/eclipse/simpletestmod/.classpath new file mode 100644 index 000000000..4f6aaa99b --- /dev/null +++ b/fml/eclipse/simpletestmod/.classpath @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/fml/eclipse/simpletestmod/.project b/fml/eclipse/simpletestmod/.project new file mode 100644 index 000000000..a96e04f8a --- /dev/null +++ b/fml/eclipse/simpletestmod/.project @@ -0,0 +1,17 @@ + + + simpletestmod + + + + + + org.eclipse.jdt.core.javabuilder + + + + + + org.eclipse.jdt.core.javanature + + diff --git a/fml/eclipse/simpletestmod/.settings/org.eclipse.jdt.core.prefs b/fml/eclipse/simpletestmod/.settings/org.eclipse.jdt.core.prefs new file mode 100644 index 000000000..7341ab168 --- /dev/null +++ b/fml/eclipse/simpletestmod/.settings/org.eclipse.jdt.core.prefs @@ -0,0 +1,11 @@ +eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7 +org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve +org.eclipse.jdt.core.compiler.compliance=1.7 +org.eclipse.jdt.core.compiler.debug.lineNumber=generate +org.eclipse.jdt.core.compiler.debug.localVariable=generate +org.eclipse.jdt.core.compiler.debug.sourceFile=generate +org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enumIdentifier=error +org.eclipse.jdt.core.compiler.source=1.7 diff --git a/fml/eclipse/simpletestmod/src/mod_testMod.java b/fml/eclipse/simpletestmod/src/mod_testMod.java new file mode 100644 index 000000000..f84837b63 --- /dev/null +++ b/fml/eclipse/simpletestmod/src/mod_testMod.java @@ -0,0 +1,35 @@ +public class mod_testMod extends BaseMod { + + + @MLProp + public static byte byteptest = 5; + @MLProp + public static short shortptest = 5; + @MLProp + public static int intptest = 5; + @MLProp + public static long longptest = 5; + @MLProp + public static float floatptest = 5; + @MLProp + public static double doubleptest = 5; + @MLProp + public static boolean booleanptest = false; + + @Override + public String getVersion() { + return "test"; + } + + @Override + public void load() { + System.out.println("byte : "+byteptest); + System.out.println("short : "+shortptest); + System.out.println("int : "+intptest); + System.out.println("long : "+longptest); + System.out.println("float : "+floatptest); + System.out.println("double : "+doubleptest); + System.out.println("bool : "+booleanptest); + } + +} \ No newline at end of file diff --git a/fml/eclipse/testmod.zip b/fml/eclipse/testmod.zip new file mode 100644 index 000000000..717b04903 Binary files /dev/null and b/fml/eclipse/testmod.zip differ