Changeset 207

Timestamp:

04/09/11 09:29:07 (14 months ago)

Author:

stefan

Message:

fixed bug #182: JErgometer wants to update even if it's a bleeding edge version

Location:

trunk

Files:

• build.xml (modified) (1 diff)
• CHANGELOG (modified) (1 diff)
• src/org/jergometer/Jergometer.java (modified) (2 diffs)
• src/org/jergometer/translation/jergometer_de.properties (modified) (1 diff)
• src/org/jergometer/translation/jergometer.properties (modified) (1 diff)

trunk/build.xml

@@ -52 +52 @@
       <jvmarg value="-Djava.library.path=${lib}/dlls/${os.name}/${os.arch}" />
 <!--      <jvmarg value="-Djava.util.logging.config.file=conf/logging.properties" />-->
+      <arg value="--bleeding-edge"/>
     </java>
   </target>

trunk/CHANGELOG

@@ -3 +3 @@
 
 == coming 0.7.12 ==
-
+* [stefan]  * fixed bug #182: JErgometer wants to update even if it's a bleeding edge version
 
 == 0.7.11 ==

trunk/src/org/jergometer/Jergometer.java

@@ -55 +55 @@
         new ParamsExt.Option("help",     'h', I18n.getString("args.show_help")),
         new ParamsExt.Option("nogui",    'G', I18n.getString("args.disable_gui")),
+        new ParamsExt.Option("bleeding-edge", null, I18n.getString("args.bleeding_edge")),
         new ParamsExt.Option("color",    'c', I18n.getString("args.color", bold("on"), bold("off"))),
         new ParamsExt.Option("version",  'v', I18n.getString("args.show_version"))
@@ -70 +71 @@
       params.printHelp();
       System.exit(0);
+    }
+
+    if (params.isOptionAvailable("bleeding-edge")) {
+      version = "*Bleeding Edge*";
+      devVersion = true;
+      updatable = false;
     }
 

trunk/src/org/jergometer/translation/jergometer_de.properties

@@ -1 +1 @@
 args.show_help=zeige Hilfe
 args.disable_gui=keine GUI
+args.bleeding_edge=Bleeding Edge-Version
 args.show_version=zeige Version
 args.options=Optionen

trunk/src/org/jergometer/translation/jergometer.properties

@@ -1 +1 @@
 args.show_help=show help
 args.disable_gui=disable GUI
+args.bleeding_edge=Bleeding Edge version
 args.show_version=show version
 args.options=options