[reprap-commits] SF.net SVN: reprap:[3611] trunk/reprap/host/src/org/reprap/gui/botConsole/ PrintTabFrame.java

[<jma...@us...>]

Revision: 3611
          http://reprap.svn.sourceforge.net/reprap/?rev=3611&view=rev
Author:   jmarsden
Date:     2010-06-25 06:06:35 +0000 (Fri, 25 Jun 2010)

Log Message:
-----------
Display correct local expected finish time and fix typo.
Patch by David Johnson <dav...@mo...>

Modified Paths:
--------------
    trunk/reprap/host/src/org/reprap/gui/botConsole/PrintTabFrame.java

Modified: trunk/reprap/host/src/org/reprap/gui/botConsole/PrintTabFrame.java
===================================================================
--- trunk/reprap/host/src/org/reprap/gui/botConsole/PrintTabFrame.java	2010-06-24 20:11:43 UTC (rev 3610)
+++ trunk/reprap/host/src/org/reprap/gui/botConsole/PrintTabFrame.java	2010-06-25 06:06:35 UTC (rev 3611)
@@ -115,9 +115,9 @@
     	progressBar.setValue((int)(100*fractionDone));
     	
     	GregorianCalendar cal = new GregorianCalendar();
-    	SimpleDateFormat dateFormat = new SimpleDateFormat("EE HH:mm");
+    	SimpleDateFormat dateFormat = new SimpleDateFormat("EE HH:mm:ss Z");
     	Date d = cal.getTime();
-		long e = d.getTime() + cal.getTimeZone().getOffset(d.getTime());
+	long e = d.getTime();
     	if(startTime < 0)
     	{
     		startTime = e;
@@ -131,12 +131,6 @@
     	int h = (int)(f/60000)/60;
     	int m = (int)(f/60000)%60;
     	
-    	// No idea why this next bit doesn't work...
-    	//if(cal.getTimeZone().inDaylightTime(d))
-    	//{
-    		//f = f + 3600000;
-    		//System.out.println("DST");
-    	//}
     	if(m > 9)
     		expectedBuildTime.setText("" + h + ":" + m);
     	else
@@ -254,7 +248,7 @@
         expectedBuildTime.setText("00:00"); // NOI18N
 
         expectedFinishTimeLabel.setFont(new java.awt.Font("Tahoma", 0, 12));
-        expectedFinishTimeLabel.setText("Expected to finsh at:"); // NOI18N
+        expectedFinishTimeLabel.setText("Expected to finish at:"); // NOI18N
 
         expectedFinishTime.setFont(new java.awt.Font("Tahoma", 0, 12));
         expectedFinishTime.setText("    -"); // NOI18N


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.