[Thaw-dev] r12009 - in trunk/apps/Thaw/src/thaw: core fcp plugins/index

[jfle...@freenetproject.org]

Author: jflesch
Date: 2007-03-07 14:26:47 +0000 (Wed, 07 Mar 2007)
New Revision: 12009

Modified:
   trunk/apps/Thaw/src/thaw/core/ConfigWindow.java
   trunk/apps/Thaw/src/thaw/fcp/FCPQueueManager.java
   trunk/apps/Thaw/src/thaw/plugins/index/IndexConfigPanel.java
Log:
Add some icons to the config window

Modified: trunk/apps/Thaw/src/thaw/core/ConfigWindow.java
===================================================================
--- trunk/apps/Thaw/src/thaw/core/ConfigWindow.java     2007-03-07 12:41:16 UTC 
(rev 12008)
+++ trunk/apps/Thaw/src/thaw/core/ConfigWindow.java     2007-03-07 14:26:47 UTC 
(rev 12009)
@@ -91,14 +91,14 @@
         * Remove them and re-add them.
         */
        private void addTabs() {
-               tabs.remove( thawConfigPanel.getPanel() );
-               tabs.remove( nodeConfigPanel.getPanel() );
-               tabs.remove( pluginConfigPanel.getPanel() );
+               removeTab( thawConfigPanel.getPanel() );
+               removeTab( nodeConfigPanel.getPanel() );
+               removeTab( pluginConfigPanel.getPanel() );

-               tabs.add("Thaw", thawConfigPanel.getPanel());
-               tabs.add(I18n.getMessage("thaw.common.node"), 
nodeConfigPanel.getPanel());
+               addTab("Thaw", thawConfigPanel.getPanel());
+               addTab(I18n.getMessage("thaw.common.node"), 
IconBox.minConnectAction, nodeConfigPanel.getPanel());
                if(advancedMode)
-                       tabs.add(I18n.getMessage("thaw.common.plugins"), 
pluginConfigPanel.getPanel());
+                       addTab(I18n.getMessage("thaw.common.plugins"), 
IconBox.minSettings, pluginConfigPanel.getPanel());
        }


@@ -115,10 +115,15 @@
        }

        public boolean addTab(final String name, final java.awt.Component 
panel) {
-               tabs.add(name, panel);
+               tabs.addTab(name, panel);
                return true;
        }

+       public boolean addTab(final String name, javax.swing.ImageIcon icon, 
final java.awt.Component panel) {
+               tabs.addTab(name, icon, panel);
+               return true;
+       }
+
        public boolean removeTab(final java.awt.Component panel) {
                tabs.remove(panel);
                return true;

Modified: trunk/apps/Thaw/src/thaw/fcp/FCPQueueManager.java
===================================================================
--- trunk/apps/Thaw/src/thaw/fcp/FCPQueueManager.java   2007-03-07 12:41:16 UTC 
(rev 12008)
+++ trunk/apps/Thaw/src/thaw/fcp/FCPQueueManager.java   2007-03-07 14:26:47 UTC 
(rev 12009)
@@ -289,7 +289,8 @@
                        return false;
                }

-               if(queryA.getFilename().equals(queryB.getFilename())) {
+               if(queryA.getFilename() != null
+                  && queryA.getFilename().equals(queryB.getFilename())) {
                        Logger.debug(this, "isTheSame(): Filename");
                        return true;
                }

Modified: trunk/apps/Thaw/src/thaw/plugins/index/IndexConfigPanel.java
===================================================================
--- trunk/apps/Thaw/src/thaw/plugins/index/IndexConfigPanel.java        
2007-03-07 12:41:16 UTC (rev 12008)
+++ trunk/apps/Thaw/src/thaw/plugins/index/IndexConfigPanel.java        
2007-03-07 14:26:47 UTC (rev 12009)
@@ -53,7 +53,9 @@


        public void addTab() {
-               
configWindow.addTab(I18n.getMessage("thaw.plugin.index.indexes"), panel);
+               
configWindow.addTab(I18n.getMessage("thaw.plugin.index.indexes"),
+                                   thaw.core.IconBox.minIndex,
+                                   panel);
        }