Index: applications/editors/josm/plugins/AddressEdit/.classpath
===================================================================
--- applications/editors/josm/plugins/AddressEdit/.classpath	(revision 23922)
+++ applications/editors/josm/plugins/AddressEdit/.classpath	(revision 23923)
@@ -2,6 +2,9 @@
 <classpath>
 	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="src" path="images/dialogs"/>
+	<classpathentry excluding="dialogs/" kind="src" path="images"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
 	<classpathentry kind="lib" path="J:/Dokumente und Einstellungen/Oliver/Eigene Dateien/Java/Josm-svn/core/dist/3529/josm-tested.jar" sourcepath="J:/Dokumente und Einstellungen/Oliver/Eigene Dateien/Java/Josm-svn/core/src"/>
-	<classpathentry kind="output" path="bin"/>
+	<classpathentry combineaccessrules="false" kind="src" path="/JOSM"/>
+	<classpathentry kind="output" path="build"/>
 </classpath>
Index: applications/editors/josm/plugins/AddressEdit/src/org/openstreetmap/josm/plugins/addressEdit/gui/AbstractAddressEditAction.java
===================================================================
--- applications/editors/josm/plugins/AddressEdit/src/org/openstreetmap/josm/plugins/addressEdit/gui/AbstractAddressEditAction.java	(revision 23922)
+++ applications/editors/josm/plugins/AddressEdit/src/org/openstreetmap/josm/plugins/addressEdit/gui/AbstractAddressEditAction.java	(revision 23923)
@@ -58,18 +58,34 @@
 	public void setContainer(AddressEditContainer container) {
 		this.container = container;
-		updateEnabledState(container);
+		updateEnabledState();
 	}
 
 	/**
-	 * Updates 'enabled' state depending on the given selection event.
-	 * @param ev
-	 * @return
+	 * @return the event
 	 */
-	public void updateEnabledState(AddressEditSelectionEvent ev) {
-		// If the tree selection changes, we will get a new event. So this is safe.
-		super.updateEnabledState();
-		this.event = ev; // save for later use.
-		if (ev != null) {
-			updateEnabledState(ev);
+	protected AddressEditSelectionEvent getEvent() {
+		return event;
+	}
+
+	/**
+	 * @param event the event to set
+	 */
+	protected void setEvent(AddressEditSelectionEvent event) {
+		this.event = event;
+	}
+
+	/* (non-Javadoc)
+	 * @see org.openstreetmap.josm.actions.JosmAction#updateEnabledState()
+	 */
+	@Override
+	protected void updateEnabledState() {
+		if (this.event != null) {
+			updateEnabledState(this.event);
+		} else {
+			if (container != null) {
+				updateEnabledState(container);
+			} else {
+				super.updateEnabledState();
+			}
 		}
 	}
@@ -81,4 +97,11 @@
 	 */
 	protected abstract void updateEnabledState(AddressEditContainer container);
+	
+	/**
+	 * Updates 'enabled' state depending on the given address container object.
+	 * @param container The address container (maybe null).
+	 * @return
+	 */
+	protected abstract void updateEnabledState(AddressEditSelectionEvent event);
 
 	/* (non-Javadoc)
Index: applications/editors/josm/plugins/AddressEdit/src/org/openstreetmap/josm/plugins/addressEdit/gui/AddressEditDialog.java
===================================================================
--- applications/editors/josm/plugins/AddressEdit/src/org/openstreetmap/josm/plugins/addressEdit/gui/AddressEditDialog.java	(revision 23922)
+++ applications/editors/josm/plugins/AddressEdit/src/org/openstreetmap/josm/plugins/addressEdit/gui/AddressEditDialog.java	(revision 23923)
@@ -126,12 +126,18 @@
 			unresolvedPanel.setMinimumSize(new Dimension(350, 200));
 			
-			JPanel unresolvedButtons = new JPanel(new FlowLayout());
-			SideButton assign = new SideButton(resolveAction);															   
-			unresolvedButtons.add(assign);
-			SideButton guess = new SideButton(guessAddressAction);															   
-			unresolvedButtons.add(guess);
-			SideButton applyAllGuesses = new SideButton(applyAllGuessesAction);															   
-			unresolvedButtons.add(applyAllGuesses);
-			unresolvedPanel.add(unresolvedButtons, BorderLayout.SOUTH);
+			
+			try {
+				JPanel unresolvedButtons = new JPanel(new FlowLayout());
+				SideButton assign = new SideButton(resolveAction);															   
+				unresolvedButtons.add(assign);
+				SideButton guess = new SideButton(guessAddressAction);															   
+				unresolvedButtons.add(guess);
+				SideButton applyAllGuesses = new SideButton(applyAllGuessesAction);															   
+				unresolvedButtons.add(applyAllGuesses);
+				unresolvedPanel.add(unresolvedButtons, BorderLayout.SOUTH);
+			} catch (Exception e) {				
+				e.printStackTrace();
+			}
+			
 			
 			/* Map Panel */
Index: applications/editors/josm/plugins/AddressEdit/src/org/openstreetmap/josm/plugins/addressEdit/gui/ApplyAllGuessesAction.java
===================================================================
--- applications/editors/josm/plugins/AddressEdit/src/org/openstreetmap/josm/plugins/addressEdit/gui/ApplyAllGuessesAction.java	(revision 23922)
+++ applications/editors/josm/plugins/AddressEdit/src/org/openstreetmap/josm/plugins/addressEdit/gui/ApplyAllGuessesAction.java	(revision 23923)
@@ -28,5 +28,5 @@
 	public ApplyAllGuessesAction() {
 		//super(tr("Apply all guesses"), "applyguesses_24", "Turns all guesses into the corresponding tag values.");
-		super(tr("Apply all guesses"), null, "Turns all guesses into the corresponding tag values.");
+		super(tr("Apply all guesses"), "applyguesses_24", "Turns all guesses into the corresponding tag values.");
 	}
 
@@ -61,3 +61,8 @@
 		}
 	}
+
+	@Override
+	protected void updateEnabledState(AddressEditSelectionEvent event) {
+		// do nothing here
+	}
 }
Index: applications/editors/josm/plugins/AddressEdit/src/org/openstreetmap/josm/plugins/addressEdit/gui/GuessAddressDataAction.java
===================================================================
--- applications/editors/josm/plugins/AddressEdit/src/org/openstreetmap/josm/plugins/addressEdit/gui/GuessAddressDataAction.java	(revision 23922)
+++ applications/editors/josm/plugins/AddressEdit/src/org/openstreetmap/josm/plugins/addressEdit/gui/GuessAddressDataAction.java	(revision 23923)
@@ -30,5 +30,5 @@
 
 	public GuessAddressDataAction() {
-		super(tr("Guess address data"));
+		super(tr("Guess address data"), "guessstreets_24", "Tries to guess the street name by picking the name of the closest way.");
 	}