svn commit: r12685 - trunk/src_new/org/argouml: cognitive/ui uml/diagram/ui uml/ui

Author: mvw
Date: 2007-05-27 01:36:22-0700
New Revision: 12685

Modified:
   trunk/src_new/org/argouml/cognitive/ui/TabToDo.java
   trunk/src_new/org/argouml/uml/diagram/ui/TabDiagram.java
   trunk/src_new/org/argouml/uml/diagram/ui/UMLDiagram.java
   trunk/src_new/org/argouml/uml/ui/PropPanel.java

Log:
Replaced deprecated methods of the ToolBarFactory.

Modified: trunk/src_new/org/argouml/cognitive/ui/TabToDo.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/cognitive/ui/TabToDo.java?view=diff&rev=12685&p1=trunk/src_new/org/argouml/cognitive/ui/TabToDo.java&p2=trunk/src_new/org/argouml/cognitive/ui/TabToDo.java&r1=12684&r2=12685
==============================================================================
--- trunk/src_new/org/argouml/cognitive/ui/TabToDo.java	(original)
+++ trunk/src_new/org/argouml/cognitive/ui/TabToDo.java	2007-05-27 01:36:22-0700
@@ -91,8 +91,11 @@
         setLayout(new BorderLayout());
 
         Object[] actions = {actionNewToDoItem, actionResolve, actionSnooze };
-        JToolBar toolBar = ToolBarFactory.createToolBar(true, actions, false);
-        toolBar.setOrientation(SwingConstants.VERTICAL);
+        ToolBarFactory factory = new ToolBarFactory(actions);
+        factory.setRollover(true);
+        factory.setFloatable(false);
+        factory.setOrientation(SwingConstants.VERTICAL);
+        JToolBar toolBar = factory.createToolBar();
 
         add(toolBar, BorderLayout.WEST);
 

Modified: trunk/src_new/org/argouml/uml/diagram/ui/TabDiagram.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/diagram/ui/TabDiagram.java?view=diff&rev=12685&p1=trunk/src_new/org/argouml/uml/diagram/ui/TabDiagram.java&p2=trunk/src_new/org/argouml/uml/diagram/ui/TabDiagram.java&r1=12684&r2=12685
==============================================================================
--- trunk/src_new/org/argouml/uml/diagram/ui/TabDiagram.java	(original)
+++ trunk/src_new/org/argouml/uml/diagram/ui/TabDiagram.java	2007-05-27 01:36:22-0700
@@ -153,12 +153,12 @@
         if (target != null) {
             newPanel.setTarget(target);
         }
-        newPanel.setToolBar(ToolBarFactory.createToolBar(true/*rollover*/,
-                                                         target.getActions(),
-                                                         false/*floating*/));
-        setToolBar(ToolBarFactory.createToolBar(true/*rollover*/,
-                                                target.getActions(),
-                                                false/*floating*/));
+        ToolBarFactory factory = new ToolBarFactory(target.getActions());
+        factory.setRollover(true);
+        factory.setFloatable(false);
+
+        newPanel.setToolBar(factory.createToolBar());
+        setToolBar(factory.createToolBar());
         return newPanel;
     }
 

Modified: trunk/src_new/org/argouml/uml/diagram/ui/UMLDiagram.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/diagram/ui/UMLDiagram.java?view=diff&rev=12685&p1=trunk/src_new/org/argouml/uml/diagram/ui/UMLDiagram.java&p2=trunk/src_new/org/argouml/uml/diagram/ui/UMLDiagram.java&r1=12684&r2=12685
==============================================================================
--- trunk/src_new/org/argouml/uml/diagram/ui/UMLDiagram.java	(original)
+++ trunk/src_new/org/argouml/uml/diagram/ui/UMLDiagram.java	2007-05-27 01:36:22-0700
@@ -313,10 +313,11 @@
      * @see org.tigris.gef.base.Diagram#initToolBar()
      */
     public void initToolBar() {
-        toolBar =
-	    ToolBarFactory.createToolBar(true /*rollover*/,
-					 getActions(),
-					 false /*floating*/);
+        ToolBarFactory factory = new ToolBarFactory(getActions());
+        factory.setRollover(true);
+        factory.setFloatable(false);
+        
+        toolBar = factory.createToolBar();
         toolBar.putClientProperty("ToolBar.toolTipSelectTool", 
                 Translator.localize("action.select"));
     }

Modified: trunk/src_new/org/argouml/uml/ui/PropPanel.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/ui/PropPanel.java?view=diff&rev=12685&p1=trunk/src_new/org/argouml/uml/ui/PropPanel.java&p2=trunk/src_new/org/argouml/uml/ui/PropPanel.java&r1=12684&r2=12685
==============================================================================
--- trunk/src_new/org/argouml/uml/ui/PropPanel.java	(original)
+++ trunk/src_new/org/argouml/uml/ui/PropPanel.java	2007-05-27 01:36:22-0700
@@ -197,10 +197,13 @@
     }
     
     public void buildToolbar() {
-	JToolBar toolbar =
-	    ToolBarFactory.createToolBar(true, actions, false);
+        ToolBarFactory factory = new ToolBarFactory(actions);
+        factory.setRollover(true);
+        factory.setFloatable(false);
+        JToolBar toolBar = factory.createToolBar();
+
 	buttonPanel.removeAll();
-        buttonPanel.add(BorderLayout.WEST, toolbar);
+        buttonPanel.add(BorderLayout.WEST, toolBar);
         // Set the tooltip of the arrow to open combined tools:
         buttonPanel.putClientProperty("ToolBar.toolTipSelectTool",
                 Translator.localize("action.select"));