Author: jflesch
Date: 2007-04-01 14:34:14 +0000 (Sun, 01 Apr 2007)
New Revision: 12512
Added:
trunk/apps/Thaw/src/thaw/gui/WarningWindow.java
Removed:
trunk/apps/Thaw/src/thaw/core/WarningWindow.java
Modified:
trunk/apps/Thaw/src/thaw/core/ConfigWindow.java
trunk/apps/Thaw/src/thaw/core/Core.java
trunk/apps/Thaw/src/thaw/core/MainWindow.java
trunk/apps/Thaw/src/thaw/core/NodeConfigPanel.java
trunk/apps/Thaw/src/thaw/plugins/FetchPlugin.java
trunk/apps/Thaw/src/thaw/plugins/InsertPlugin.java
trunk/apps/Thaw/src/thaw/plugins/fetchPlugin/FetchPanel.java
trunk/apps/Thaw/src/thaw/plugins/index/IndexManagementHelper.java
trunk/apps/Thaw/src/thaw/plugins/insertPlugin/InsertPanel.java
Log:
Move WarningWindow class from the core package to the gui package
Modified: trunk/apps/Thaw/src/thaw/core/ConfigWindow.java
===================================================================
--- trunk/apps/Thaw/src/thaw/core/ConfigWindow.java 2007-04-01 14:28:09 UTC
(rev 12511)
+++ trunk/apps/Thaw/src/thaw/core/ConfigWindow.java 2007-04-01 14:34:14 UTC
(rev 12512)
@@ -215,7 +215,7 @@
core.getPluginManager().stopPlugins();
if (resetConnection && !core.initConnection()) {
- new WarningWindow(core,
I18n.getMessage("thaw.warning.unableToConnectTo")+ "
"+core.getConfig().getValue("nodeAddress")+":"+
core.getConfig().getValue("nodePort"));
+ new thaw.gui.WarningWindow(core,
I18n.getMessage("thaw.warning.unableToConnectTo")+ "
"+core.getConfig().getValue("nodeAddress")+":"+
core.getConfig().getValue("nodePort"));
}
needConnectionReset = false;
Modified: trunk/apps/Thaw/src/thaw/core/Core.java
===================================================================
--- trunk/apps/Thaw/src/thaw/core/Core.java 2007-04-01 14:28:09 UTC (rev
12511)
+++ trunk/apps/Thaw/src/thaw/core/Core.java 2007-04-01 14:34:14 UTC (rev
12512)
@@ -175,9 +175,9 @@
splashScreen.setProgressionAndStatus(20, "Connecting ...");
splashScreen.addIcon(IconBox.connectAction);
if(!initConnection())
- new WarningWindow(this,
I18n.getMessage("thaw.warning.unableToConnectTo")+
- " "+ config.getValue("nodeAddress")+
- ":"+ config.getValue("nodePort"));
+ new thaw.gui.WarningWindow(this,
I18n.getMessage("thaw.warning.unableToConnectTo")+
+ " "+
config.getValue("nodeAddress")+
+ ":"+
config.getValue("nodePort"));
splashScreen.setProgressionAndStatus(30, "Preparing the main
window ...");
Modified: trunk/apps/Thaw/src/thaw/core/MainWindow.java
===================================================================
--- trunk/apps/Thaw/src/thaw/core/MainWindow.java 2007-04-01 14:28:09 UTC
(rev 12511)
+++ trunk/apps/Thaw/src/thaw/core/MainWindow.java 2007-04-01 14:34:14 UTC
(rev 12512)
@@ -451,9 +451,9 @@
* Warns the user by a popup.
*/
protected void unableToConnect() {
- new WarningWindow(core,
-
I18n.getMessage("thaw.warning.unableToConnectTo")+
- "
"+core.getConfig().getValue("nodeAddress")+":"+
core.getConfig().getValue("nodePort"));
+ new thaw.gui.WarningWindow(core,
+
I18n.getMessage("thaw.warning.unableToConnectTo")+
+ "
"+core.getConfig().getValue("nodeAddress")+":"+
core.getConfig().getValue("nodePort"));
}
public void update(final java.util.Observable o, final Object arg) {
Modified: trunk/apps/Thaw/src/thaw/core/NodeConfigPanel.java
===================================================================
--- trunk/apps/Thaw/src/thaw/core/NodeConfigPanel.java 2007-04-01 14:28:09 UTC
(rev 12511)
+++ trunk/apps/Thaw/src/thaw/core/NodeConfigPanel.java 2007-04-01 14:34:14 UTC
(rev 12512)
@@ -156,11 +156,11 @@
!paramFields[0].getText().equals(currentValues[0]) &&
!"127.0.0.1".equals(paramFields[0].getText())) {
- new WarningWindow(core,
-
I18n.getMessage("thaw.config.sameComputerButNotLocalhost.l0")+"\n"+
-
I18n.getMessage("thaw.config.sameComputerButNotLocalhost.l1")+"\n"+
-
I18n.getMessage("thaw.config.sameComputerButNotLocalhost.l2")+"\n\n"+
-
I18n.getMessage("thaw.config.sameComputerButNotLocalhost.l4"));
+ new thaw.gui.WarningWindow(core,
+
I18n.getMessage("thaw.config.sameComputerButNotLocalhost.l0")+"\n"+
+
I18n.getMessage("thaw.config.sameComputerButNotLocalhost.l1")+"\n"+
+
I18n.getMessage("thaw.config.sameComputerButNotLocalhost.l2")+"\n\n"+
+
I18n.getMessage("thaw.config.sameComputerButNotLocalhost.l4"));
}
}
@@ -214,4 +214,4 @@
if(!hasBeenCancelled)
resetValues();
}
-}
\ No newline at end of file
+}
Deleted: trunk/apps/Thaw/src/thaw/core/WarningWindow.java
===================================================================
--- trunk/apps/Thaw/src/thaw/core/WarningWindow.java 2007-04-01 14:28:09 UTC
(rev 12511)
+++ trunk/apps/Thaw/src/thaw/core/WarningWindow.java 2007-04-01 14:34:14 UTC
(rev 12512)
@@ -1,29 +0,0 @@
-package thaw.core;
-
-import javax.swing.JOptionPane;
-
-/**
- * Use to create a warning popup.
- * Currently this popup is simple as possible, but
- * in the future, it may become more complex, showing,
- * for example, last log messages.
- */
-public class WarningWindow {
-
-
- public WarningWindow(final Core core,
- final String warning)
- {
- if((core != null) && (core.getMainWindow() != null)) {
-
JOptionPane.showMessageDialog(core.getMainWindow().getMainFrame(),
- warning,
- "Thaw -
"+I18n.getMessage("thaw.warning.title"),
-
JOptionPane.WARNING_MESSAGE);
- } else {
- JOptionPane.showMessageDialog(null,
- warning,
- "Thaw -
"+I18n.getMessage("thaw.warning.title"),
-
JOptionPane.WARNING_MESSAGE);
- }
- }
-}
Copied: trunk/apps/Thaw/src/thaw/gui/WarningWindow.java (from rev 12507,
trunk/apps/Thaw/src/thaw/core/WarningWindow.java)
===================================================================
--- trunk/apps/Thaw/src/thaw/gui/WarningWindow.java
(rev 0)
+++ trunk/apps/Thaw/src/thaw/gui/WarningWindow.java 2007-04-01 14:34:14 UTC
(rev 12512)
@@ -0,0 +1,32 @@
+package thaw.gui;
+
+import javax.swing.JOptionPane;
+
+import thaw.core.Core;
+import thaw.core.I18n;
+
+/**
+ * Use to create a warning popup.
+ * Currently this popup is simple as possible, but
+ * in the future, it may become more complex, showing,
+ * for example, last log messages.
+ */
+public class WarningWindow {
+
+
+ public WarningWindow(final Core core,
+ final String warning)
+ {
+ if((core != null) && (core.getMainWindow() != null)) {
+
JOptionPane.showMessageDialog(core.getMainWindow().getMainFrame(),
+ warning,
+ "Thaw -
"+I18n.getMessage("thaw.warning.title"),
+
JOptionPane.WARNING_MESSAGE);
+ } else {
+ JOptionPane.showMessageDialog(null,
+ warning,
+ "Thaw -
"+I18n.getMessage("thaw.warning.title"),
+
JOptionPane.WARNING_MESSAGE);
+ }
+ }
+}
Modified: trunk/apps/Thaw/src/thaw/plugins/FetchPlugin.java
===================================================================
--- trunk/apps/Thaw/src/thaw/plugins/FetchPlugin.java 2007-04-01 14:28:09 UTC
(rev 12511)
+++ trunk/apps/Thaw/src/thaw/plugins/FetchPlugin.java 2007-04-01 14:34:14 UTC
(rev 12512)
@@ -133,13 +133,13 @@
fetchFrame.setVisible(false);
if (trollDetected) {
- new thaw.core.WarningWindow(core,
-
I18n.getMessage("thaw.plugin.fetch.freenet0.5.l1")+"\n"
- +
I18n.getMessage("thaw.plugin.fetch.freenet0.5.l2")+"\n"
- +
I18n.getMessage("thaw.plugin.fetch.freenet0.5.l3")+"\n"
- +
I18n.getMessage("thaw.plugin.fetch.freenet0.5.l4")+"\n"
- +
I18n.getMessage("thaw.plugin.fetch.freenet0.5.l5")+"\n"
- +
I18n.getMessage("thaw.plugin.fetch.freenet0.5.l6"));
+ new thaw.gui.WarningWindow(core,
+
I18n.getMessage("thaw.plugin.fetch.freenet0.5.l1")+"\n"
+ +
I18n.getMessage("thaw.plugin.fetch.freenet0.5.l2")+"\n"
+ +
I18n.getMessage("thaw.plugin.fetch.freenet0.5.l3")+"\n"
+ +
I18n.getMessage("thaw.plugin.fetch.freenet0.5.l4")+"\n"
+ +
I18n.getMessage("thaw.plugin.fetch.freenet0.5.l5")+"\n"
+ +
I18n.getMessage("thaw.plugin.fetch.freenet0.5.l6"));
}
}
Modified: trunk/apps/Thaw/src/thaw/plugins/InsertPlugin.java
===================================================================
--- trunk/apps/Thaw/src/thaw/plugins/InsertPlugin.java 2007-04-01 14:28:09 UTC
(rev 12511)
+++ trunk/apps/Thaw/src/thaw/plugins/InsertPlugin.java 2007-04-01 14:34:14 UTC
(rev 12512)
@@ -14,10 +14,11 @@
import thaw.core.I18n;
import thaw.gui.IconBox;
import thaw.core.Logger;
-import thaw.core.WarningWindow;
+import thaw.gui.WarningWindow;
import thaw.fcp.FCPClientPut;
import thaw.plugins.insertPlugin.InsertPanel;
+
public class InsertPlugin implements thaw.core.Plugin, ActionListener {
private Core core;
Modified: trunk/apps/Thaw/src/thaw/plugins/fetchPlugin/FetchPanel.java
===================================================================
--- trunk/apps/Thaw/src/thaw/plugins/fetchPlugin/FetchPanel.java
2007-04-01 14:28:09 UTC (rev 12511)
+++ trunk/apps/Thaw/src/thaw/plugins/fetchPlugin/FetchPanel.java
2007-04-01 14:34:14 UTC (rev 12512)
@@ -25,7 +25,7 @@
import thaw.gui.GUIHelper;
import thaw.core.I18n;
import thaw.core.Logger;
-import thaw.core.WarningWindow;
+import thaw.gui.WarningWindow;
import thaw.plugins.FetchPlugin;
public class FetchPanel implements java.awt.event.ActionListener,
MouseListener {
@@ -217,7 +217,7 @@
}
if((destinationField.getText() == null) || "".equals(
destinationField.getText() )) {
- new thaw.core.WarningWindow(core,
I18n.getMessage("thaw.plugin.fetch.chooseADestination"));
+ new WarningWindow(core,
I18n.getMessage("thaw.plugin.fetch.chooseADestination"));
return;
}
Modified: trunk/apps/Thaw/src/thaw/plugins/index/IndexManagementHelper.java
===================================================================
--- trunk/apps/Thaw/src/thaw/plugins/index/IndexManagementHelper.java
2007-04-01 14:28:09 UTC (rev 12511)
+++ trunk/apps/Thaw/src/thaw/plugins/index/IndexManagementHelper.java
2007-04-01 14:34:14 UTC (rev 12512)
@@ -849,7 +849,7 @@
if (node instanceof Index) {
if (((Index)node).getRevision() <= 0) {
- new thaw.core.WarningWindow(null,
I18n.getMessage("thaw.plugin.index.stillRev0"));
+ new thaw.gui.WarningWindow(null,
I18n.getMessage("thaw.plugin.index.stillRev0"));
}
}
Modified: trunk/apps/Thaw/src/thaw/plugins/insertPlugin/InsertPanel.java
===================================================================
--- trunk/apps/Thaw/src/thaw/plugins/insertPlugin/InsertPanel.java
2007-04-01 14:28:09 UTC (rev 12511)
+++ trunk/apps/Thaw/src/thaw/plugins/insertPlugin/InsertPanel.java
2007-04-01 14:34:14 UTC (rev 12512)
@@ -27,7 +27,7 @@
import thaw.core.FileChooser;
import thaw.core.I18n;
import thaw.core.Logger;
-import thaw.core.WarningWindow;
+import thaw.gui.WarningWindow;
import thaw.fcp.FCPClientPut;
import thaw.plugins.InsertPlugin;
