Changeset 24416 in osm for applications/editors/josm/plugins/smed/plugs/harbour/src

Timestamp:

2010-11-26T16:38:45+01:00 (14 years ago)

Author:

postfix

Message:

ore work on harbor edtor

Location:

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

Files:

• harbour/panels/PanelGeneral.java (modified) (11 diffs)
• harbour/panels/PanelLimits.java (deleted)
• harbour/widgets (added)
• harbour/widgets/ExtTextField.java (added)
• harbour/widgets/LightTile.java (added)
• harbour/widgets/Sheltergram.java (added)
• images/anker.png (added)
• images/e.png (added)
• images/n.png (added)
• images/ne.png (added)
• images/nw.png (added)
• images/s.png (added)
• images/se.png (added)
• images/sw.png (added)
• images/w.png (added)

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

@@ -1 +1 @@
 package harbour.panels;
+
+import harbour.widgets.Sheltergram;
 
 import javax.swing.BorderFactory;
@@ -6 +8 @@
 import java.awt.Color;
 import java.awt.Dimension;
-import javax.swing.JButton;
 import java.awt.Rectangle;
 import java.awt.Font;
@@ -12 +13 @@
 import javax.swing.JTextField;
 import javax.swing.JComboBox;
-import java.awt.Label;
 import javax.swing.JCheckBox;
 import java.awt.Cursor;
-import java.awt.GridBagLayout;
-import javax.swing.ImageIcon;
 
 public class PanelGeneral extends JPanel {
@@ -44 +42 @@
         private JCheckBox desCheckBox = null;
         private JCheckBox jCheckBox1 = null;
-        private JLabel shelterLabel = null;
         private JLabel tshelterLabel = null;
+        private JPanel shelterPanel = null;
+        private JLabel sizeLabel = null;
+        private JLabel typeLabel = null;
         public PanelGeneral() {
                 super();
@@ -58 +58 @@
          */
         private void initialize() {
+        typeLabel = new JLabel();
+        typeLabel.setBounds(new Rectangle(270, 2, 43, 20));
+        typeLabel.setFont(new Font("Dialog", Font.PLAIN, 12));
+        typeLabel.setText("Type");
+        sizeLabel = new JLabel();
+        sizeLabel.setBounds(new Rectangle(210, 2, 34, 20));
+        sizeLabel.setFont(new Font("Dialog", Font.PLAIN, 12));
+        sizeLabel.setText("Size");
         tshelterLabel = new JLabel();
-        tshelterLabel.setBounds(new Rectangle(252, 145, 50, 20));
+        tshelterLabel.setBounds(new Rectangle(246, 144, 50, 20));
         tshelterLabel.setText("Schutz");
-        shelterLabel = new JLabel();
-        shelterLabel.setBounds(new Rectangle(235, 167, 80, 80));
-        shelterLabel.setIcon(new ImageIcon(getClass().getResource("/images/shelter.png")));
         qLabel = new JLabel();
         qLabel.setBounds(new Rectangle(50, 205, 85, 20));
@@ -76 +81 @@
         chartLabel.setBounds(new Rectangle(210, 50, 35, 20));
         chartLabel.setFont(new Font("Dialog", Font.PLAIN, 12));
-        chartLabel.setText("Chart");
+        chartLabel.setText("Karte");
         pubLabel = new JLabel();
         pubLabel.setBounds(new Rectangle(53, 50, 70, 20));
@@ -82 +87 @@
         pubLabel.setText("Publication");
         harborLabel = new JLabel();
-        harborLabel.setBounds(new Rectangle(148, 2, 160, 20));
-        harborLabel.setText("Harbor : Size       Type");
+        harborLabel.setBounds(new Rectangle(148, 2, 55, 20));
+        harborLabel.setText("Harbor:");
         lonLabel = new JLabel();
         lonLabel.setBounds(new Rectangle(100, 25, 23, 20));
@@ -123 +128 @@
         this.add(getDesCheckBox(), null);
         this.add(getJCheckBox1(), null);
-        this.add(shelterLabel, null);
         this.add(tshelterLabel, null);
+        this.add(getShelterPanel(), null);
+        this.add(sizeLabel, null);
+        this.add(typeLabel, null);
         }
 
@@ -282 +289 @@
                 if (jCheckBox2 == null) {
                         jCheckBox2 = new JCheckBox();
-                        jCheckBox2.setBounds(new Rectangle(125, 117, 110, 21));
+                        jCheckBox2.setBounds(new Rectangle(125, 117, 70, 21));
                         jCheckBox2.setFont(new Font("Dialog", Font.PLAIN, 12));
                         jCheckBox2.setText("ratsam");
@@ -301 +308 @@
                         tugCheckBox.setBounds(new Rectangle(5, 160, 121, 20));
                         tugCheckBox.setFont(new Font("Dialog", Font.PLAIN, 12));
-                        tugCheckBox.setText("Rettungsdienst");
+                        tugCheckBox.setText("Bergungsschiff");
                 }
                 return tugCheckBox;
@@ -374 +381 @@
         }
 
+
+
+        /**
+         * This method initializes shelterPanel 
+         *      
+         * @return javax.swing.JPanel   
+         */
+        private JPanel getShelterPanel() {
+                if (shelterPanel == null) {
+                        shelterPanel = new Sheltergram();
+                        shelterPanel.setBounds(new Rectangle(232, 170, 75, 75));
+                }
+                return shelterPanel;
+        }
+
 }