Changeset 203

Timestamp:

08/08/08 11:27:36 (16 years ago)

Author:

ra33

Message:

Modified SimpleWidget1 to work with dataFrame

Location:

trunk/src/org/expeditee/items/widgets

Files:

• InteractiveWidget.java (modified) (2 diffs)
• SampleWidget1.java (modified) (1 diff)
• SampleWidget2.java (modified) (1 diff)

trunk/src/org/expeditee/items/widgets/InteractiveWidget.java

@@ -196 +196 @@
                         inst = (InteractiveWidget) ct.newInstance(arglist);
                 } catch (Exception e) {
+                        e.printStackTrace();
                         throw new InteractiveWidgetNotAvailableException(
                                         "Failed to create instance via reflection: " + e.toString(),
@@ -432 +433 @@
 
                 // Get the initial color and thickness from the source text item
-                _d1.setColor(getSource().getColor());
-                _d1.setThickness(getSource().getThickness());
+                _d1.setColor(source.getColor());
+                _d1.setThickness(source.getThickness());
         }
 

trunk/src/org/expeditee/items/widgets/SampleWidget1.java

@@ -3 +3 @@
 import javax.swing.JComboBox;
 
+import org.expeditee.gui.Frame;
 import org.expeditee.items.Text;
 
 public class SampleWidget1 extends InteractiveWidget {
-        
-        static String testItems[] = new String[] {"dog", "fish", "cat", "pig"};
-        
+
+        static String testItems[] = new String[] { "dog", "fish", "cat", "pig" };
+
         private JComboBox _combo;
-        
+
         public SampleWidget1(Text source, String[] args) {
                 super(source, new JComboBox(testItems), 200, 200, 50, 50);
-                _combo = (JComboBox)super._swingComponent;
+                _combo = (JComboBox) super._swingComponent;
 
-                // Set state
-                if (args != null) {
-                        
-                        int selectedItem = 0;
-                        
-                        // extract selected index
-                        if (args.length >= 1 && args[0] != null) {
-                                try {
-                                        selectedItem = Integer.parseInt(args[0]);
-                                } catch (NumberFormatException e) {
-                                        e.printStackTrace();
-                                }
-                        }
-                        
-                        // Get defined items
-                        if (args.length >= 2) {
-                                _combo.removeAllItems();
-                                for (int i = 1; i < args.length; i++) {
-                                        if (args[i] != null) _combo.addItem(args[i]);
-                                }
-                                if (_combo.getItemCount() == 0) {
-                                        for (String s : testItems) _combo.addItem(s);
-                                }
-                        }
-                        
-                        if (selectedItem < 0) selectedItem = 0;
-                        else if (selectedItem >= _combo.getItemCount()) 
-                                selectedItem = _combo.getItemCount() - 1;
-                        _combo.setSelectedIndex(selectedItem);
-                        
-                }
-                
-                
+                refresh();
         }
 
         @Override
         protected String[] getArgs() {
-                
-                String[] stateArgs = new String[_combo.getItemCount() + 1];
+                String[] stateArgs = new String[1];
                 stateArgs[0] = Integer.toString(_combo.getSelectedIndex());
-                for (int i = 0; i < _combo.getItemCount(); i++) {
-                        stateArgs[i + 1] = _combo.getItemAt(i).toString();
+                return stateArgs;
+        }
+        
+        @Override
+        public void refresh() {
+                super.refresh();
+                Frame frame = getDataFrame();
+                if(frame != null) {
+                        _combo.removeAllItems();
+                        for(Text text: frame.getBodyTextItems(false)) {
+                                _combo.addItem(text.getText());
+                        }
+                        _combo.setSelectedIndex(0);
                 }
-                
-                return stateArgs;
         }
 

trunk/src/org/expeditee/items/widgets/SampleWidget2.java

@@ -79 +79 @@
         @Override
         protected String[] getArgs() {
+                
                 return new String[] { 
                                 Integer.toString(_combo.getSelectedIndex()),