Changeset 24751 in osm

Timestamp:

2010-12-15T00:31:15+01:00 (14 years ago)

Author:

postfix

Message:

 

Location:

applications/editors/josm/plugins/smed/plugs/harbour

Files:

• images/layer (added)
• images/layer/Hbr_16x14.png (added)
• src/harbour/models (added)
• src/harbour/models/CraneTableModel.java (added)
• src/harbour/models/SearchTableModel.java (added)
• src/harbour/panels/PanelEnv.java (modified) (3 diffs)
• src/harbour/panels/PanelRelations.java (modified) (3 diffs)
• src/harbour/panels/PanelSearchPois.java (modified) (5 diffs)
• src/harbour/panels/PanelServices.java (modified) (12 diffs)
• src/harbour/table_utils (added)
• src/harbour/table_utils/StateRenderer.java (added)
• src/harbour/table_utils/TristateCBEditor.java (added)
• src/harbour/widgets/CraneTable.java (added)
• src/harbour/widgets/TristateCheckBox.java (modified) (7 diffs)
• src/images/Wasser.png (added)
• src/images/e_green.png (modified) ( previous)
• src/images/e_grey.png (modified) ( previous)
• src/images/e_red.png (modified) ( previous)
• src/images/e_yellow.png (modified) ( previous)
• src/images/fest.png (added)
• src/images/mobil.png (added)
• src/images/n_green.png (modified) ( previous)
• src/images/n_grey.png (modified) ( previous)
• src/images/n_red.png (modified) ( previous)
• src/images/n_yellow.png (modified) ( previous)
• src/images/ne_green.png (modified) ( previous)
• src/images/ne_grey.png (modified) ( previous)
• src/images/ne_red.png (modified) ( previous)
• src/images/ne_yellow.png (modified) ( previous)
• src/images/nw_green.png (modified) ( previous)
• src/images/nw_grey.png (modified) ( previous)
• src/images/nw_red.png (modified) ( previous)
• src/images/nw_yellow.png (modified) ( previous)
• src/images/s_green.png (modified) ( previous)
• src/images/s_grey.png (modified) ( previous)
• src/images/s_red.png (modified) ( previous)
• src/images/s_yellow.png (modified) ( previous)
• src/images/se_green.png (modified) ( previous)
• src/images/se_grey.png (modified) ( previous)
• src/images/se_red.png (modified) ( previous)
• src/images/se_yellow.png (modified) ( previous)
• src/images/sw_green.png (modified) ( previous)
• src/images/sw_grey.png (modified) ( previous)
• src/images/sw_red.png (modified) ( previous)
• src/images/sw_yellow.png (modified) ( previous)
• src/images/w_green.png (modified) ( previous)
• src/images/w_grey.png (modified) ( previous)
• src/images/w_red.png (modified) ( previous)
• src/images/w_yellow.png (modified) ( previous)

applications/editors/josm/plugins/smed/plugs/harbour/src/harbour/panels/PanelEnv.java

@@ -1 +1 @@
 package harbour.panels;
-
-import java.awt.Color;
-import java.awt.GridBagLayout;
 
 import javax.swing.BorderFactory;
 import javax.swing.JPanel;
 import javax.swing.JLabel;
+
+import java.awt.Color;
 import java.awt.Rectangle;
 
@@ -13 +12 @@
         private static final long serialVersionUID = 1L;
         private JLabel envLabel = null;
+        
 
         /**
@@ -37 +37 @@
                 this.add(envLabel, null);
         }
-
 }

applications/editors/josm/plugins/smed/plugs/harbour/src/harbour/panels/PanelRelations.java

@@ -3 +3 @@
 import java.awt.Color;
 import java.awt.GridBagLayout;
+import java.awt.Rectangle;
 
 import javax.swing.BorderFactory;
 import javax.swing.JPanel;
 import javax.swing.JLabel;
-import java.awt.Rectangle;
+import java.awt.Dimension;
 
 public class PanelRelations extends JPanel {
@@ -31 +32 @@
                 relLabel.setBounds(new Rectangle(101, 18, 120, 36));
                 relLabel.setText("Relationen");
+                
                 this.setSize(330, 270);
                 this.setLayout(null);
@@ -36 +38 @@
                 this.add(relLabel, null);
         }
-
 }

applications/editors/josm/plugins/smed/plugs/harbour/src/harbour/panels/PanelSearchPois.java

@@ -14 +14 @@
 import javax.swing.JTable;
 import javax.swing.JComboBox;
+import harbour.models.SearchTableModel;
 
 public class PanelSearchPois extends JPanel {
@@ -25 +26 @@
         private JTable jTable = null;
         private JLabel layerLabel = null;
-        private JComboBox jComboBox = null;
+        private JComboBox layerComboBox = null;
 
         /**
@@ -62 +63 @@
                 this.add(getJScrollPane(), null);
                 this.add(layerLabel, null);
-                this.add(getJComboBox(), null);
+                this.add(getLayerComboBox(), null);
         }
 
@@ -114 +115 @@
                 if (jTable == null) {
                         jTable = new JTable();
+                        jTable.setModel(new SearchTableModel());
                 }
                 return jTable;
@@ -119 +121 @@
 
         /**
-         * This method initializes jComboBox    
+         * This method initializes layerComboBox        
          *      
          * @return javax.swing.JComboBox        
          */
-        private JComboBox getJComboBox() {
-                if (jComboBox == null) {
-                        jComboBox = new JComboBox();
-                        jComboBox.setBounds(new Rectangle(70, 5, 250, 20));
+        private JComboBox getLayerComboBox() {
+                if (layerComboBox == null) {
+                        layerComboBox = new JComboBox();
+                        layerComboBox.setBounds(new Rectangle(70, 5, 250, 20));
                 }
-                return jComboBox;
+                return layerComboBox;
         }
 

applications/editors/josm/plugins/smed/plugs/harbour/src/harbour/panels/PanelServices.java

@@ -1 +1 @@
 package harbour.panels;
 
+import harbour.widgets.CraneTable;
 import harbour.widgets.TristateCheckBox;
 
 import java.awt.Color;
-import java.awt.GridBagLayout;
 
 import javax.swing.BorderFactory;
@@ -12 +12 @@
 import javax.swing.JCheckBox;
 import java.awt.Font;
-import javax.swing.JComboBox;
 import javax.swing.ImageIcon;
+import javax.swing.JScrollPane;
 
 public class PanelServices extends JPanel {
@@ -32 +32 @@
         private TristateCheckBox ancCheckBox = null;
         private JLabel moorLabel = null;
-        private JLabel craneLabel = null;
-        private JLabel hLabel = null;
-        private JLabel fLabel = null;
-        private JLabel zLabel = null;
-        private JLabel nLabel = null;
         private TristateCheckBox slipCheckBox = null;
-        private JLabel fixLabel = null;
-        private TristateCheckBox hfCheckBox = null;
-        private TristateCheckBox ffCheckBox = null;
-        private TristateCheckBox zfCheckBox = null;
-        private TristateCheckBox nfCheckBox = null;
         private TristateCheckBox dockCheckBox = null;
-        private JLabel mobLabel = null;
-        private TristateCheckBox hmCheckBox = null;
-        private TristateCheckBox fmCheckBox = null;
-        private TristateCheckBox zmCheckBox = null;
-        private TristateCheckBox nmCheckBox = null;
-        private JLabel schwLabel = null;
-        private TristateCheckBox hsCheckBox = null;
-        private TristateCheckBox fsCheckBox = null;
-        private TristateCheckBox zsCheckBox = null;
-        private TristateCheckBox nsCheckBox = null;
         private JLabel DLLabel = null;
         private TristateCheckBox anbCheckBox = null;
@@ -78 +58 @@
         private TristateCheckBox imCheckBox = null;
         private TristateCheckBox bmCheckBox = null;
+        private CraneTable craneScrollPane = null;
         /**
          * This is the default constructor
@@ -104 +85 @@
                 recLabel.setBounds(new Rectangle(187, 165, 90, 20));
                 recLabel.setFont(new Font("Dialog", Font.PLAIN, 12));
-                recLabel.setText("Entsorgungen:");
+                recLabel.setText("Entsorgung:");
                 servLabel = new JLabel();
                 servLabel.setBounds(new Rectangle(1, 185, 45, 20));
@@ -112 +93 @@
                 DLLabel.setBounds(new Rectangle(3, 165, 147, 20));
                 DLLabel.setText("weitere Dienstleistungen");
-                schwLabel = new JLabel();
-                schwLabel.setBounds(new Rectangle(5, 142, 40, 16));
-                schwLabel.setFont(new Font("Dialog", Font.PLAIN, 12));
-                schwLabel.setText("  schw.");
-                mobLabel = new JLabel();
-                mobLabel.setBounds(new Rectangle(5, 126, 40, 16));
-                mobLabel.setFont(new Font("Dialog", Font.PLAIN, 12));
-                mobLabel.setText("  mobil");
-                fixLabel = new JLabel();
-                fixLabel.setBounds(new Rectangle(5, 110, 40, 16));
-                fixLabel.setFont(new Font("Dialog", Font.PLAIN, 12));
-                fixLabel.setText("     fest");
-                nLabel = new JLabel();
-                nLabel.setBounds(new Rectangle(200, 90, 38, 20));
-                nLabel.setFont(new Font("Dialog", Font.PLAIN, 12));
-                nLabel.setText("  0-25t");
-                zLabel = new JLabel();
-                zLabel.setBounds(new Rectangle(150, 90, 45, 20));
-                zLabel.setFont(new Font("Dialog", Font.PLAIN, 12));
-                zLabel.setText(" 25-50t");
-                fLabel = new JLabel();
-                fLabel.setBounds(new Rectangle(100, 90, 45, 20));
-                fLabel.setFont(new Font("Dialog", Font.PLAIN, 12));
-                fLabel.setText("50-100t");
-                hLabel = new JLabel();
-                hLabel.setBounds(new Rectangle(50, 90, 45, 20));
-                hLabel.setFont(new Font("Dialog", Font.PLAIN, 12));
-                hLabel.setText("  >100t");
-                craneLabel = new JLabel();
-                craneLabel.setBounds(new Rectangle(5, 90, 42, 20));
-                craneLabel.setText("    Kran");
                 moorLabel = new JLabel();
-                moorLabel.setBounds(new Rectangle(145, 50, 65, 16));
+                moorLabel.setBounds(new Rectangle(145, 50, 70, 16));
                 moorLabel.setFont(new Font("Dialog", Font.PLAIN, 12));
                 moorLabel.setText("Ankerplatz:");
@@ -176 +126 @@
                 this.add(getAncCheckBox(), null);
                 this.add(moorLabel, null);
-                this.add(craneLabel, null);
-                this.add(hLabel, null);
-                this.add(fLabel, null);
-                this.add(zLabel, null);
-                this.add(nLabel, null);
                 this.add(getSlipCheckBox(), null);
-                this.add(fixLabel, null);
-                this.add(getHfCheckBox(), null);
-                this.add(getFfCheckBox(), null);
-                this.add(getZfCheckBox(), null);
-                this.add(getNfCheckBox(), null);
                 this.add(getDockCheckBox(), null);
-                this.add(mobLabel, null);
-                this.add(getHmCheckBox(), null);
-                this.add(getFmCheckBox(), null);
-                this.add(getZmCheckBox(), null);
-                this.add(getNmCheckBox(), null);
-                this.add(schwLabel, null);
-                this.add(getHsCheckBox(), null);
-                this.add(getFsCheckBox(), null);
-                this.add(getZsCheckBox(), null);
-                this.add(getNsCheckBox(), null);
                 this.add(DLLabel, null);
                 this.add(getAnbCheckBox(), null);
@@ -222 +152 @@
                 this.add(getImCheckBox(), null);
                 this.add(getBmCheckBox(), null);
+                this.add(getCraneScrollPane(), null);
         }
 
@@ -307 +238 @@
                 if (railCheckBox == null) {
                         railCheckBox = new TristateCheckBox();
-                        railCheckBox.setBounds(new Rectangle(98, 26, 72, 20));
+                        railCheckBox.setBounds(new Rectangle(98, 26, 80, 20));
                         railCheckBox.setFont(new Font("Dialog", Font.PLAIN, 12));
                         railCheckBox.setText("Bahnhof");
@@ -375 +306 @@
 
         /**
-         * This method initializes hfCheckBox   
-         *      
-         * @return javax.swing.JCheckBox        
-         */
-        private JCheckBox getHfCheckBox() {
-                if (hfCheckBox == null) {
-                        hfCheckBox = new TristateCheckBox();
-                        hfCheckBox.setBounds(new Rectangle(60, 108, 20, 20));
-                }
-                return hfCheckBox;
-        }
-
-        /**
-         * This method initializes ffCheckBox   
-         *      
-         * @return javax.swing.JCheckBox        
-         */
-        private TristateCheckBox getFfCheckBox() {
-                if (ffCheckBox == null) {
-                        ffCheckBox = new TristateCheckBox();
-                        ffCheckBox.setBounds(new Rectangle(110, 108, 20, 20));
-                }
-                return ffCheckBox;
-        }
-
-        /**
-         * This method initializes zfCheckBox   
-         *      
-         * @return javax.swing.JCheckBox        
-         */
-        private TristateCheckBox getZfCheckBox() {
-                if (zfCheckBox == null) {
-                        zfCheckBox = new TristateCheckBox();
-                        zfCheckBox.setBounds(new Rectangle(160, 108, 20, 20));
-                }
-                return zfCheckBox;
-        }
-
-        /**
-         * This method initializes nfCheckBox   
-         *      
-         * @return javax.swing.JCheckBox        
-         */
-        private TristateCheckBox getNfCheckBox() {
-                if (nfCheckBox == null) {
-                        nfCheckBox = new TristateCheckBox();
-                        nfCheckBox.setBounds(new Rectangle(210, 108, 20, 20));
-                }
-                return nfCheckBox;
-        }
-
-        /**
          * This method initializes dockCheckBox 
          *      
@@ -439 +318 @@
                 }
                 return dockCheckBox;
-        }
-
-        /**
-         * This method initializes hmCheckBox   
-         *      
-         * @return javax.swing.JCheckBox        
-         */
-        private TristateCheckBox getHmCheckBox() {
-                if (hmCheckBox == null) {
-                        hmCheckBox = new TristateCheckBox();
-                        hmCheckBox.setBounds(new Rectangle(60, 124, 20, 20));
-                }
-                return hmCheckBox;
-        }
-
-        /**
-         * This method initializes fmCheckBox   
-         *      
-         * @return javax.swing.JCheckBox        
-         */
-        private TristateCheckBox getFmCheckBox() {
-                if (fmCheckBox == null) {
-                        fmCheckBox = new TristateCheckBox();
-                        fmCheckBox.setBounds(new Rectangle(110, 124, 20, 20));
-                }
-                return fmCheckBox;
-        }
-
-        /**
-         * This method initializes zmCheckBox   
-         *      
-         * @return javax.swing.JCheckBox        
-         */
-        private TristateCheckBox getZmCheckBox() {
-                if (zmCheckBox == null) {
-                        zmCheckBox = new TristateCheckBox();
-                        zmCheckBox.setBounds(new Rectangle(160, 124, 20, 20));
-                }
-                return zmCheckBox;
-        }
-
-        /**
-         * This method initializes nmCheckBox   
-         *      
-         * @return javax.swing.JCheckBox        
-         */
-        private TristateCheckBox getNmCheckBox() {
-                if (nmCheckBox == null) {
-                        nmCheckBox = new TristateCheckBox();
-                        nmCheckBox.setBounds(new Rectangle(210, 124, 20, 20));
-                }
-                return nmCheckBox;
-        }
-
-        /**
-         * This method initializes hsCheckBox   
-         *      
-         * @return javax.swing.JCheckBox        
-         */
-        private TristateCheckBox getHsCheckBox() {
-                if (hsCheckBox == null) {
-                        hsCheckBox = new TristateCheckBox();
-                        hsCheckBox.setBounds(new Rectangle(60, 140, 20, 20));
-                }
-                return hsCheckBox;
-        }
-
-        /**
-         * This method initializes fsCheckBox   
-         *      
-         * @return javax.swing.JCheckBox        
-         */
-        private TristateCheckBox getFsCheckBox() {
-                if (fsCheckBox == null) {
-                        fsCheckBox = new TristateCheckBox();
-                        fsCheckBox.setBounds(new Rectangle(110, 140, 20, 20));
-                }
-                return fsCheckBox;
-        }
-
-        /**
-         * This method initializes zsCheckBox   
-         *      
-         * @return javax.swing.JCheckBox        
-         */
-        private TristateCheckBox getZsCheckBox() {
-                if (zsCheckBox == null) {
-                        zsCheckBox = new TristateCheckBox();
-                        zsCheckBox.setBounds(new Rectangle(160, 140, 21, 21));
-                }
-                return zsCheckBox;
-        }
-
-        /**
-         * This method initializes nsCheckBox   
-         *      
-         * @return javax.swing.JCheckBox        
-         */
-        private TristateCheckBox getNsCheckBox() {
-                if (nsCheckBox == null) {
-                        nsCheckBox = new TristateCheckBox();
-                        nsCheckBox.setBounds(new Rectangle(210, 140, 21, 21));
-                }
-                return nsCheckBox;
         }
 
@@ -831 +606 @@
         }
 
+        /**
+         * This method initializes craneScrollPane      
+         *      
+         * @return javax.swing.JScrollPane      
+         */
+        private CraneTable getCraneScrollPane() {
+                if (craneScrollPane == null) {
+                        craneScrollPane = new CraneTable();
+                        craneScrollPane.setBounds(new Rectangle(3, 90, 207, 66));
+                }
+                return craneScrollPane;
+        }
+
 }

applications/editors/josm/plugins/smed/plugs/harbour/src/harbour/widgets/TristateCheckBox.java

@@ -3 +3 @@
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
+import java.awt.event.ItemEvent;
 import java.awt.event.ItemListener;
 import java.awt.event.MouseAdapter;
@@ -32 +33 @@
         
         private TristateDecorator model;
+        private TristateCheckBox box;
         
         Icon d = new ImageIcon(getClass().getResource("/images/qm_12x12.png"));
@@ -40 +42 @@
         public TristateCheckBox(String text, Icon icon, State initial) {
                 super(text,icon);
+                
+                box = this;
                 
                 // add a listener for when the mouse is pressed
@@ -46 +50 @@
                                 grabFocus();
                                 model.nextState();
+                                
+                                fireItemStateChanged(new ItemEvent(box,
+                                                ItemEvent.ITEM_STATE_CHANGED,
+                                                box,
+                                                box.isSelected() ?  ItemEvent.SELECTED : ItemEvent.DESELECTED));
+                                
                                 if(model.getState() == NOT_SELECTED) setIcon(n);
                                 if(model.getState() == DONT_CARE) setIcon(d);
@@ -70 +80 @@
                 model = new TristateDecorator(getModel());
                 setModel(model);
-                setState(DONT_CARE);
-                setIcon(d);
+                setState(initial);
         }
         
@@ -93 +102 @@
          * DONT_CARE. If state == null, it is treated as DONT_CARE
          */
-        public void setState(State state) { model.setState(state); }
+        public void setState(State state) {
+                if(state == NOT_SELECTED)       setIcon(n);
+                if(state == DONT_CARE)  setIcon(d);
+                if(state == SELECTED)   setIcon(s);
+                
+                fireItemStateChanged(new ItemEvent(this,
+                                ItemEvent.ITEM_STATE_CHANGED,
+                                this,
+                                this.isSelected() ?  ItemEvent.SELECTED : ItemEvent.DESELECTED));
+                
+                model.setState(state);
+                }
         
         /**
@@ -113 +133 @@
          */
         private class TristateDecorator implements ButtonModel {
-                
+
                 private final ButtonModel other;