The following commit has been merged in the patch/version branch:
commit 1824b3830e9206feddf5961649db67ac00caaeac
Merge: 7881af7c63327d3dc7507d83c6148912d1574756
854ab751ff17e847c954924e49297bc850679ebf
Author: Giovanni Mascellani <mascell...@poisson.phc.unipi.it>
Date: Tue Dec 27 19:31:39 2011 +0100
Merge commit 'refs/top-bases/patch/version' into patch/version
Conflicts:
geogebra/GeoGebra.java
diff --combined geogebra/GeoGebra.java
index 86c3333,f9c86c8..3d754ca
--- a/geogebra/GeoGebra.java
+++ b/geogebra/GeoGebra.java
@@@ -8,95 -8,96 +8,98 @@@ This program is free software; you can
under the terms of the GNU General Public License as published by
the Free Software Foundation.
- */
+ */
package geogebra;
import java.awt.Frame;
import java.awt.Toolkit;
import java.net.URL;
-
+
public class GeoGebra extends Object {
-
+
// GeoGebra version
- public static final String BUILD_DATE = "30 November 2011";
- public static final String VERSION_STRING = "4.0.13.0";
+ public static final String BUILD_DATE = "25 December 2011";
+ public static final String VERSION_STRING = "4.0.17.0";
public static final String SPLASH_STRING = "splash40.png";
public static final String PREFERENCES_ROOT = "/geogebra40";
- public static final String SHORT_VERSION_STRING = "4.0"; // used for
online archive
+ public static final String SHORT_VERSION_STRING = "4.0"; // used for
online
+
// archive
public static final boolean CAS_VIEW_ENABLED = false;
public static final boolean IS_PRE_RELEASE =
!VERSION_STRING.endsWith(".0");
- // Debian version
- public static final String DEBIAN_VERSION_STRING =
GeoGebraDebian.DEBIAN_VERSION_STRING;
-
++ public static final String DEBIAN_VERSION_STRING =
GeoGebraDebian.DEBIAN_VERSION_STRING;
++
// File format versions
public static final String XML_FILE_FORMAT = "4.0";
public static final String GGB_XSD_FILENAME = "ggb.xsd"; // for ggb
files
- public static final String GGT_XSD_FILENAME = "ggt.xsd"; // for macro
files
+ public static final String GGT_XSD_FILENAME = "ggt.xsd"; // for macro
files
public static final String I2G_FILE_FORMAT = "0.1.20080731";
-
+
// pre-releases and I2G
- public static final boolean DISABLE_I2G = !IS_PRE_RELEASE;
+ public static final boolean DISABLE_I2G = !IS_PRE_RELEASE;
// URLs
- public final static String GEOGEBRA_ONLINE_ARCHIVE_BASE =
"http://www.geogebra.org/webstart/"; + SHORT_VERSION_STRING + "/";
- public final static String GEOGEBRA_ONLINE_WEBSTART_BASE =
"http://www.geogebra.org/webstart/"; + SHORT_VERSION_STRING + "/";
- public final static String GEOGEBRA_ONLINE_WEBSTART_BASE_ALTERNATIVE =
"http://jars.geogebra.org/webstart/"; + SHORT_VERSION_STRING + "/";
+ public final static String GEOGEBRA_ONLINE_ARCHIVE_BASE =
"http://www.geogebra.org/webstart/";
+ + SHORT_VERSION_STRING + "/";
+ public final static String GEOGEBRA_ONLINE_WEBSTART_BASE =
"http://www.geogebra.org/webstart/";
+ + SHORT_VERSION_STRING + "/";
+ public final static String GEOGEBRA_ONLINE_WEBSTART_BASE_ALTERNATIVE =
"http://jars.geogebra.org/webstart/";
+ + SHORT_VERSION_STRING + "/";
public static final String LOADING_GIF =
"http://www.geogebra.org/webstart/loading.gif";;
public final static String GEOGEBRA_WEBSITE =
"http://www.geogebra.org/";;
public final static String HELP_URL = GEOGEBRA_WEBSITE + "help";
public final static String GEOGEBRATUBE_WEBSITE =
"http://www.geogebratube.org/";;
-
+
// max possible heap space for applets in MB
public final static int MAX_HEAP_SPACE = 512;
-
+
public static Frame splashFrame = null;
-
- public static void main(String[] cmdArgs) {
+
+ public static void main(String[] cmdArgs) {
CommandLineArguments args = new CommandLineArguments(cmdArgs);
-
- boolean showSplash = true;
- if(!args.getBooleanValue("showSplash", true)) {
- showSplash = false;
- }
-
- if(args.containsArg("help")||args.containsArg("v")) {
- showSplash = false;
- }
-
- if(args.containsArg("regressionFile")) {
- showSplash = false;
+
+ boolean showSplash = true;
+ if (!args.getBooleanValue("showSplash", true)) {
+ showSplash = false;
+ }
+
+ if (args.containsArg("help") || args.containsArg("v")) {
+ showSplash = false;
+ }
+
+ if (args.containsArg("regressionFile")) {
+ showSplash = false;
+ }
+
+ if (showSplash) {
+ // Show splash screen
+ URL imageURL = GeoGebra.class.getResource("/geogebra/"
+ SPLASH_STRING);
+ if (imageURL != null) {
+ splashFrame =
SplashWindow.splash(Toolkit.getDefaultToolkit().createImage(imageURL));
+ } else {
+ System.err.println("Splash image not found");
+ }
+ }
+
+ // Start GeoGebra
+ try {
+ startGeoGebra(args);
+ } catch (Throwable e) {
+ e.printStackTrace();
+ System.err.flush();
+ System.exit(10);
+ }
+
+ // Hide splash screen
+ if (splashFrame != null) {
+ splashFrame.setVisible(false);
+ }
+ }
+
+ private static void startGeoGebra(CommandLineArguments args) {
+ // create and open first GeoGebra window
+ geogebra.gui.app.GeoGebraFrame.main(args);
}
-
- if (showSplash) {
- // Show splash screen
- URL imageURL =
GeoGebra.class.getResource("/geogebra/"+SPLASH_STRING);
- if (imageURL != null) {
- splashFrame = SplashWindow.splash(
- Toolkit.getDefaultToolkit().createImage(imageURL)
- );
- } else {
- System.err.println("Splash image not found");
- }
- }
-
- // Start GeoGebra
- try {
- startGeoGebra(args);
- } catch (Throwable e) {
- e.printStackTrace();
- System.err.flush();
- System.exit(10);
- }
-
- // Hide splash screen
- if (splashFrame != null) splashFrame.setVisible(false);
- }
-
- private static void startGeoGebra(CommandLineArguments args) {
- // create and open first GeoGebra window
- geogebra.gui.app.GeoGebraFrame.main(args);
- }
-
- }
+
+ }
--
GeoGebra: Dynamic mathematics software for education
_______________________________________________
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
![http://www.geogebra.org/webstart/loading.gif"](http://www.geogebra.org/webstart/loading.gif"){kind=link}