Index: /applications/editors/josm/plugins/smed/plugs/harbour/src/harbour/dialogs/HarbourAction.java
===================================================================
--- /applications/editors/josm/plugins/smed/plugs/harbour/src/harbour/dialogs/HarbourAction.java	(revision 24354)
+++ /applications/editors/josm/plugins/smed/plugs/harbour/src/harbour/dialogs/HarbourAction.java	(revision 24355)
@@ -1,3 +1,5 @@
 package harbour.dialogs;
+
+import harbour.panels.*;
 
 import javax.swing.JPanel;
@@ -5,6 +7,4 @@
 import java.awt.Rectangle;
 import javax.swing.JButton;
-import javax.swing.BorderFactory;
-import java.awt.Color;
 import javax.swing.JTextField;
 import javax.swing.JLabel;
@@ -16,5 +16,4 @@
 
 	private JPanel harbourPanel = null;  //  @jve:decl-index=0:visual-constraint="68,31"
-	private JPanel comArea = null;
 	private JButton comButton = null;
 	private JButton restButton = null;
@@ -30,6 +29,6 @@
 	private JButton forButton = null;
 	private JButton fastforButton = null;
-	private JLabel jLabel = null;
-	private JButton queraButton = null;
+	private JLabel queryLabel = null;
+	private JButton queryButton = null;
 	private JButton changequeryButton = null;
 	private JComboBox typComboBox = null;
@@ -41,4 +40,32 @@
 	private JLabel regLabel = null;
 	private JTextField regTextField = null;
+	private PanelGeneral panelGeneral = null;
+	private PanelLimits panelLimits = null;
+	private PanelServices panelServices = null;
+	private PanelEnv panelEnv = null;
+	private PanelRelations panelRelations = null;
+	
+	public HarbourAction() {
+		panelGeneral= new PanelGeneral();
+		panelGeneral.setBounds(new Rectangle(2, 56, 330, 270));
+		panelGeneral.setVisible(true);
+		
+		panelLimits = new PanelLimits();
+		panelLimits.setBounds(new Rectangle(2, 56, 330, 270));
+		panelLimits.setVisible(false);
+		
+		panelServices = new PanelServices();
+		panelServices.setBounds(new Rectangle(2, 56, 330, 270));
+		panelServices.setVisible(false);
+		
+		panelEnv = new PanelEnv();
+		panelEnv.setBounds(new Rectangle(2, 56, 330, 270));
+		panelEnv.setVisible(false);
+		
+		panelRelations = new PanelRelations();
+		panelRelations.setBounds(new Rectangle(2, 56, 330, 270));
+		panelRelations.setVisible(false);
+	}
+	
 	/**
 	 * This method initializes harbourPanel	
@@ -60,8 +87,8 @@
 			typeLabel.setBounds(new Rectangle(289, 5, 43, 20));
 			typeLabel.setText("Type:");
-			jLabel = new JLabel();
-			jLabel.setBounds(new Rectangle(212, 334, 80, 15));
-			jLabel.setFont(new Font("Dialog", Font.PLAIN, 12));
-			jLabel.setText("Suche nach:");
+			queryLabel = new JLabel();
+			queryLabel.setBounds(new Rectangle(212, 334, 80, 15));
+			queryLabel.setFont(new Font("Dialog", Font.PLAIN, 12));
+			queryLabel.setText("Suche nach:");
 			setLabel = new JLabel();
 			setLabel.setBounds(new Rectangle(2, 330, 68, 21));
@@ -74,10 +101,14 @@
 			harbourPanel.setLayout(null);
 			harbourPanel.setSize(new Dimension(400, 360));
-			harbourPanel.add(getComArea(), null);
-			harbourPanel.add(getComButton(), null);
+			harbourPanel.add(panelGeneral,    null);
+			harbourPanel.add(panelLimits,     null);
+			harbourPanel.add(panelServices,   null);
+			harbourPanel.add(panelEnv,        null);
+			harbourPanel.add(panelRelations,  null);
+			harbourPanel.add(getComButton(),  null);
 			harbourPanel.add(getRestButton(), null);
 			harbourPanel.add(getServButton(), null);
-			harbourPanel.add(getEnvButton(), null);
-			harbourPanel.add(getRelButton(), null);
+			harbourPanel.add(getEnvButton(),  null);
+			harbourPanel.add(getRelButton(),  null);
 			harbourPanel.add(getNameTextField(), null);
 			harbourPanel.add(getFastbackButton(), null);
@@ -88,6 +119,6 @@
 			harbourPanel.add(getForButton(), null);
 			harbourPanel.add(getFastforButton(), null);
-			harbourPanel.add(jLabel, null);
-			harbourPanel.add(getQueraButton(), null);
+			harbourPanel.add(queryLabel, null);
+			harbourPanel.add(getQueryButton(), null);
 			harbourPanel.add(getChangequeryButton(), null);
 			harbourPanel.add(getTypComboBox(), null);
@@ -103,18 +134,4 @@
 	}
 
-	/**
-	 * This method initializes comArea	
-	 * 	
-	 * @return javax.swing.JPanel	
-	 */
-	private JPanel getComArea() {
-		if (comArea == null) {
-			comArea = new JPanel();
-			comArea.setLayout(null);
-			comArea.setBounds(new Rectangle(2, 56, 330, 270));
-			comArea.setBorder(BorderFactory.createLineBorder(Color.black, 1));
-		}
-		return comArea;
-	}
 
 	/**
@@ -130,4 +147,13 @@
 			comButton.setIcon(new ImageIcon(getClass().getResource("/images/Windrose.png")));
 			comButton.setToolTipText("Allgemeines");
+			comButton.addActionListener(new java.awt.event.ActionListener() {
+				public void actionPerformed(java.awt.event.ActionEvent e) {
+					panelLimits.setVisible(false);
+					panelServices.setVisible(false);
+					panelEnv.setVisible(false);
+					panelRelations.setVisible(false);
+					panelGeneral.setVisible(true);
+				}
+			});
 		}
 		return comButton;
@@ -143,6 +169,15 @@
 			restButton = new JButton();
 			restButton.setBounds(new Rectangle(340, 111, 50, 50));
-			restButton.setIcon(new ImageIcon(getClass().getResource("/images/Zeichen_264.png")));
+			restButton.setIcon(new ImageIcon(getClass().getResource("/images/Schranken.png")));
 			restButton.setToolTipText("Einfahrtbeschränkungen");
+			restButton.addActionListener(new java.awt.event.ActionListener() {
+				public void actionPerformed(java.awt.event.ActionEvent e) {
+					panelGeneral.setVisible(false);
+					panelServices.setVisible(false);
+					panelEnv.setVisible(false);
+					panelRelations.setVisible(false);
+					panelLimits.setVisible(true);
+				}
+			});
 		}
 		return restButton;
@@ -160,4 +195,13 @@
 			servButton.setIcon(new ImageIcon(getClass().getResource("/images/Kran.png")));
 			servButton.setToolTipText("Dienste");
+			servButton.addActionListener(new java.awt.event.ActionListener() {
+				public void actionPerformed(java.awt.event.ActionEvent e) {
+					panelGeneral.setVisible(false);
+					panelLimits.setVisible(false);
+					panelEnv.setVisible(false);
+					panelRelations.setVisible(false);
+					panelServices.setVisible(true);
+				}
+			});
 		}
 		return servButton;
@@ -173,5 +217,15 @@
 			envButton = new JButton();
 			envButton.setBounds(new Rectangle(340, 221, 50, 50));
+			envButton.setIcon(new ImageIcon(getClass().getResource("/images/Env.png")));
 			envButton.setToolTipText("Umgebung");
+			envButton.addActionListener(new java.awt.event.ActionListener() {
+				public void actionPerformed(java.awt.event.ActionEvent e) {
+					panelGeneral.setVisible(false);
+					panelLimits.setVisible(false);
+					panelServices.setVisible(false);
+					panelRelations.setVisible(false);
+					panelEnv.setVisible(true);	
+				}
+			});
 		}
 		return envButton;
@@ -187,5 +241,15 @@
 			relButton = new JButton();
 			relButton.setBounds(new Rectangle(340, 276, 50, 50));
+			relButton.setIcon(new ImageIcon(getClass().getResource("/images/Relationen.png")));
 			relButton.setToolTipText("Relationen");
+			relButton.addActionListener(new java.awt.event.ActionListener() {
+				public void actionPerformed(java.awt.event.ActionEvent e) {
+					panelGeneral.setVisible(false);
+					panelLimits.setVisible(false);
+					panelServices.setVisible(false);
+					panelEnv.setVisible(false);
+					panelRelations.setVisible(true);
+				}
+			});
 		}
 		return relButton;
@@ -272,17 +336,17 @@
 
 	/**
-	 * This method initializes queraButton	
-	 * 	
-	 * @return javax.swing.JButton	
-	 */
-	private JButton getQueraButton() {
-		if (queraButton == null) {
-			queraButton = new JButton();
-			queraButton.setBounds(new Rectangle(292, 330, 80, 20));
-			queraButton.setFont(new Font("Dialog", Font.PLAIN, 12));
-			queraButton.setToolTipText("");
-			queraButton.setText("Hafen");
-		}
-		return queraButton;
+	 * This method initializes queryButton	
+	 * 	
+	 * @return javax.swing.JButton	
+	 */
+	private JButton getQueryButton() {
+		if (queryButton == null) {
+			queryButton = new JButton();
+			queryButton.setBounds(new Rectangle(292, 330, 80, 20));
+			queryButton.setFont(new Font("Dialog", Font.PLAIN, 12));
+			queryButton.setToolTipText("");
+			queryButton.setText("Hafen");
+		}
+		return queryButton;
 	}