From 0914ea5b6c9c14c0db22a0a084c73ff020a57f02 Mon Sep 17 00:00:00 2001 From: Jonathan Bernard Date: Thu, 11 Sep 2008 18:15:57 -0500 Subject: [PATCH] Tried JNLP, not workingas expected, so diabled. Artifacts remain. Bug fixes committer: Jonathan Bernard --- clean_all_whitespace.sh | 1 + master.jnlp | 21 + nbproject/build-impl.xml | 3 +- nbproject/configs/JWS_generated.properties | 4 + nbproject/genfiles.properties | 4 +- nbproject/jnlp-impl.xml | 461 ++++++++++++++++++ nbproject/private/config.properties | 0 nbproject/private/private.properties | 8 +- nbproject/private/private.xml | 4 + nbproject/project.properties | 16 +- nbproject/project.xml | 5 + src/jdbernard/timestamper/TimeStamperApp.java | 4 +- .../timestamper/TimeStamperView.form | 6 +- .../timestamper/TimeStamperView.java | 17 +- .../resources/TimeStamperApp.properties | 8 +- 15 files changed, 533 insertions(+), 29 deletions(-) create mode 100755 master.jnlp create mode 100755 nbproject/configs/JWS_generated.properties create mode 100755 nbproject/jnlp-impl.xml create mode 100755 nbproject/private/config.properties diff --git a/clean_all_whitespace.sh b/clean_all_whitespace.sh index 588c950..2c5df31 100755 --- a/clean_all_whitespace.sh +++ b/clean_all_whitespace.sh @@ -8,4 +8,5 @@ ./clean_trailing_whitespace.sh nbproject/*.xml ./clean_trailing_whitespace.sh nbproject/project.* ./clean_trailing_whitespace.sh nbproject/*.properties +./clean_trailing_whitespace.sh nbproject/configs/*.properties ./clean_trailing_whitespace.sh nbproject/private/private.* diff --git a/master.jnlp b/master.jnlp new file mode 100755 index 0000000..1333aa8 --- /dev/null +++ b/master.jnlp @@ -0,0 +1,21 @@ + + + + ${APPLICATION.TITLE} + ${APPLICATION.VENDOR} + + ${APPLICATION.DESC} + ${APPLICATION.DESC.SHORT} + + + + + + + + + + + + + diff --git a/nbproject/build-impl.xml b/nbproject/build-impl.xml index c7ec535..8f9bece 100755 --- a/nbproject/build-impl.xml +++ b/nbproject/build-impl.xml @@ -20,6 +20,7 @@ is divided into following sections: --> + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + $${APPLICATION.TITLE} + $${APPLICATION.VENDOR} + + $${APPLICATION.DESC} + $${APPLICATION.DESC.SHORT} + + + + + + + + + + + + + +]]> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Test page for launching the application via JNLP + + +

Test page for launching the application via JNLP

+ Launch the application + + + +]]> + + + diff --git a/nbproject/private/config.properties b/nbproject/private/config.properties new file mode 100755 index 0000000..e69de29 diff --git a/nbproject/private/private.properties b/nbproject/private/private.properties index 965073e..1974116 100755 --- a/nbproject/private/private.properties +++ b/nbproject/private/private.properties @@ -1,2 +1,6 @@ -jaxws.endorsed.dir=/usr/local/netbeans-6.1/java2/modules/ext/jaxws21/api -user.properties.file=/home/jdbernard/.netbeans/6.1/build.properties +do.depend=false +do.jar=true +javac.debug=true +javadoc.preview=true +jaxws.endorsed.dir=C:\\Program Files\\NetBeans 6.1\\java2\\modules\\ext\\jaxws21\\api +user.properties.file=C:\\Documents and Settings\\jbernard\\.netbeans\\6.1\\build.properties diff --git a/nbproject/private/private.xml b/nbproject/private/private.xml index c1f155a..f3fb4c5 100755 --- a/nbproject/private/private.xml +++ b/nbproject/private/private.xml @@ -1,4 +1,8 @@ + + file:/C:/Documents%20and%20Settings/jbernard/My%20Documents/Development/TimeStamper/src/jdbernard/timestamper/TimeStamperApp.java + file:/C:/Documents%20and%20Settings/jbernard/My%20Documents/Development/TimeStamper/src/jdbernard/timestamper/TimeStamperView.java + diff --git a/nbproject/project.properties b/nbproject/project.properties index bee9559..507c11d 100755 --- a/nbproject/project.properties +++ b/nbproject/project.properties @@ -1,8 +1,8 @@ -application.desc=A simple java desktop application based on Swing Application Framework -application.homepage=http://appframework.dev.java.net -application.title=Basic Application Example -application.vendor=Sun Microsystems Inc. -application.version=1.3 +application.desc=Simple application used to track activities throughout time. +application.homepage= +application.title=TimeStamper +application.vendor=Jonathan Bernard +application.version=1.4 build.classes.dir=${build.dir}/classes build.classes.excludes=**/*.java,**/*.form # This directory is removed when the project is cleaned: @@ -49,6 +49,12 @@ javadoc.splitindex=true javadoc.use=true javadoc.version=false javadoc.windowtitle= +jnlp.codebase.type=local +jnlp.codebase.url=file:/C:/Documents%20and%20Settings/jbernard/My%20Documents/Development/TimeStamper/dist/ +jnlp.enabled=false +jnlp.icon=C:\\Documents and Settings\\jbernard\\My Documents\\Development\\TimeStamper\\src\\jdbernard\\timestamper\\resources\\icons\\appointment-new-16x16.png +jnlp.offline-allowed=true +jnlp.signed=true main.class=jdbernard.timestamper.TimeStamperApp manifest.file=manifest.mf meta.inf.dir=${src.dir}/META-INF diff --git a/nbproject/project.xml b/nbproject/project.xml index caa4303..119d852 100755 --- a/nbproject/project.xml +++ b/nbproject/project.xml @@ -2,6 +2,11 @@ org.netbeans.modules.java.j2seproject + + + + + TimeStamper 1.6.5 diff --git a/src/jdbernard/timestamper/TimeStamperApp.java b/src/jdbernard/timestamper/TimeStamperApp.java index b79a7fc..f007ac8 100755 --- a/src/jdbernard/timestamper/TimeStamperApp.java +++ b/src/jdbernard/timestamper/TimeStamperApp.java @@ -15,6 +15,7 @@ import java.util.logging.FileHandler; import java.util.logging.Handler; import java.util.logging.Level; import java.util.logging.Logger; +import java.util.logging.SimpleFormatter; import org.jdesktop.application.Application; import org.jdesktop.application.SingleFrameApplication; @@ -44,6 +45,7 @@ implements Application.ExitListener { try { FileHandler fh = new FileHandler("TimeStamper.log", true); + fh.setFormatter(new SimpleFormatter()); fh.setLevel(Level.ALL); } catch (IOException ioe) { log.warning("Could not open log file for writing. Switching console" @@ -141,7 +143,7 @@ implements Application.ExitListener { try { activeTimeline = Timeline.readFromFile(filename); - // TODO: re-init gui for new timeline + currentTimelineFile = filename; } catch (IOException ioe) { log.warning("Could not load from the file: " + ioe.getLocalizedMessage()); diff --git a/src/jdbernard/timestamper/TimeStamperView.form b/src/jdbernard/timestamper/TimeStamperView.form index f026bf4..313417c 100755 --- a/src/jdbernard/timestamper/TimeStamperView.form +++ b/src/jdbernard/timestamper/TimeStamperView.form @@ -26,15 +26,15 @@ - + - + - + diff --git a/src/jdbernard/timestamper/TimeStamperView.java b/src/jdbernard/timestamper/TimeStamperView.java index 7e9b1db..790fe15 100755 --- a/src/jdbernard/timestamper/TimeStamperView.java +++ b/src/jdbernard/timestamper/TimeStamperView.java @@ -19,6 +19,7 @@ import org.jdesktop.application.Action; import org.jdesktop.application.ResourceMap; import org.jdesktop.application.SingleFrameApplication; import org.jdesktop.application.FrameView; +import sun.security.jca.GetInstance; /** * The application's main frame. @@ -72,16 +73,7 @@ public class TimeStamperView extends FrameView implements MouseMotionListener { boldTaskFont = thinTaskFont.deriveFont(Font.BOLD); // refresh new timeline - Timeline t = ((TimeStamperApp) getApplication()).getActiveTimeline(); - Timeline.TimelineMarker lastMarker = t.getLastMarker(new Date()); - - if (lastMarker != null) { - mostRecentTask = lastMarker.getTimestamp(); - startTimeLabel.setText(Timeline.shortFormat.format(lastMarker.getTimestamp())); - - taskTextField.setText(lastMarker.getMark()); - notesDialog.setNotes(lastMarker.getNotes()); - } + refreshDialog(); } /** This method is called from within the constructor to @@ -401,7 +393,10 @@ public class TimeStamperView extends FrameView implements MouseMotionListener { ((TimeStamperApp) getApplication()).loadTimeline( fileChooser.getSelectedFile().getAbsolutePath()); - // refresh new timeline + refreshDialog(); + } + + public void refreshDialog() { Timeline t = ((TimeStamperApp) getApplication()).getActiveTimeline(); Timeline.TimelineMarker lastMarker = t.getLastMarker(new Date()); diff --git a/src/jdbernard/timestamper/resources/TimeStamperApp.properties b/src/jdbernard/timestamper/resources/TimeStamperApp.properties index 814b225..d7e5dd5 100755 --- a/src/jdbernard/timestamper/resources/TimeStamperApp.properties +++ b/src/jdbernard/timestamper/resources/TimeStamperApp.properties @@ -2,12 +2,12 @@ Application.name = TimeStamper Application.title = TimeStamper -Application.version = 1.3 +Application.version = 1.4 Application.vendor = Jonathan Bernard Application.homepage = -Application.description = A simple Java desktop application based on Swing Application Framework. -Application.vendorId = Sun -Application.id = ${Application.name} +Application.description = Simple application used to track activities throughout time. +Application.vendorId = Jonathan Bernard +Application.id = TimeStamper Application.lookAndFeel = system Application.icon=/jdbernard/timestamper/resources/icons/appointment-new-16x16.png quit.Action.text=Exit