[Schmitzm-commits] r1689 - trunk/schmitzm-core/src/main/java/de/schmitzm/swing/swingworker

[scm-commit@wald.intevation.org]

Author: alfonx
Date: 2011-08-25 17:13:19 +0200 (Thu, 25 Aug 2011)
New Revision: 1689

Modified:
   trunk/schmitzm-core/src/main/java/de/schmitzm/swing/swingworker/AtlasStatusDialog.java
Log:


Modified: trunk/schmitzm-core/src/main/java/de/schmitzm/swing/swingworker/AtlasStatusDialog.java
===================================================================
--- trunk/schmitzm-core/src/main/java/de/schmitzm/swing/swingworker/AtlasStatusDialog.java	2011-08-25 15:09:21 UTC (rev 1688)
+++ trunk/schmitzm-core/src/main/java/de/schmitzm/swing/swingworker/AtlasStatusDialog.java	2011-08-25 15:13:19 UTC (rev 1689)
@@ -261,17 +261,6 @@
 			setDescription(startText);
 	}
 
-	//
-	// /**
-	// * Returns a localized string for the specified key.
-	// *
-	// * @param key
-	// * an integer key
-	// * @return the associated string
-	// */
-	// private String getString(final int key) {
-	// return Vocabulary.getResources(window.getLocale()).getString(key);
-	// }
 
 	/**
 	 * Returns the window title. The default title is "Progress" localized in
@@ -284,13 +273,13 @@
 		return (String) get(Caller.TITLE);
 	}
 
-	//
-	// /**
-	// * Set the window title. A {@code null} value reset the default title.
-	// *
-	// * @param title
-	// * the window title
-	// */
+	
+	 /**
+	 * Set the window title. A {@code null} value reset the default title.
+	 *
+	 * @param title
+	 * the window title
+	 */
 	@Override
 	public void setTitle(String title) {
 		if (title == null) {
@@ -624,6 +613,7 @@
 				break; // Need further action below.
 			}
 			}
+			
 			/*
 			 * Some of the tasks above requires an action on the window, which
 			 * may be a JDialog or a JInternalFrame. We need to determine the
@@ -677,18 +667,8 @@
 				warningArea.append((String) value);
 			}
 		}
-	}
+	} 
 
-	// @Override
-	// public void setTask(InternationalString task) {
-	// setDescription(task.toString());
-	// }
-	//
-	// @Override
-	// public InternationalString getTask() {
-	// return new SimpleInternationalString(getDescription());
-	// }
-
 	@Override
 	public void startModal() {
 		if (javax.swing.SwingUtilities.isEventDispatchThread()) {
@@ -709,8 +689,6 @@
 					startModal();
 				}
 			});
-			// started();
-			// window.setModal(true); // CALL zeug?!
 		}
 	}
 
@@ -758,15 +736,9 @@
 		LOGGER.debug("progress " + url + " " + urlString + " " + doneSoFar
 				+ " " + full + " " + percentage);
 
-		// String fullSize = mbdf.format(full);
-
-		// setDescription("Downloading " + filename + " (" + percentage + "%)");
-
 		setDescription(SwingUtil.R("AtlasStatusDialog.jnlp.progress", filename,
 				percentage));
 
-		// setDescription("Downloading " + filename + " " + percentage + "% of "
-		// + fullSize);
 
 	}
 
@@ -787,7 +759,6 @@
 
 		setDescription(SwingUtil.R("AtlasStatusDialog.jnlp.upgrading",
 				filename, overallPercent));
-		// setDescription("Upgrading " + filename + " " + overallPercent + "%");
 	}
 
 	@Override
@@ -807,8 +778,6 @@
 		setDescription(SwingUtil.R("AtlasStatusDialog.jnlp.validating",
 				getShortFilename(url), overallPercent));
 
-		// setDescription("Validating " + filename + " " + overallPercent +
-		// "%");
 	}
 
 	final static Pattern SHORTEN_ATLAS_JAR_NAMES = Pattern