Merge lp:~revager-developers/revager/assistant_redesign into lp:revager

[Davide Casciato]

redesign of the assistant

[lp:~revager-developers/revager/assistant_redesign]

42. By Davide Casciato on 2010-03-15

review changes

43. By Davide Casciato on 2010-03-15

review changes

44. By D.Casciato <D.Casciato@Hyperion> on 2010-05-15

old revisions

45. By D.Casciato <D.Casciato@Hyperion> on 2010-05-19

bugfixing

46. By Johannes Wettinger on 2010-05-25

minor bugs fixed

47. By D.Casciato <D.Casciato@Hyperion> on 2010-05-26

minor bug fixes (windows7)

=== modified file '.project'
--- .project	2009-11-24 15:10:55 +0000
+++ .project	2010-05-26 20:44:25 +0000
@@ -1,17 +1,17 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>RevAger</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>assistant_redesign</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+	</natures>
+</projectDescription>
 
=== modified file 'src/org/revager/app/model/ApplicationData.java'
--- src/org/revager/app/model/ApplicationData.java	2010-01-31 17:32:35 +0000
+++ src/org/revager/app/model/ApplicationData.java	2010-05-26 20:44:25 +0000
@@ -41,7 +41,6 @@
 import org.revager.app.model.appdata.AppSettingValue;
 import org.revager.tools.FileTools;
 
-
 /**
  * This class is a sub-class of Data an handles the application data, internally
  * stored in a JavaDB.
 
=== modified file 'src/org/revager/gui/AbstractDialog.java'
--- src/org/revager/gui/AbstractDialog.java	2010-01-31 17:32:35 +0000
+++ src/org/revager/gui/AbstractDialog.java	2010-05-26 20:44:25 +0000
@@ -51,7 +51,6 @@
 import org.revager.gui.workers.LoadEmbeddedHelpWorker;
 import org.revager.tools.GUITools;
 
-
 /**
  * This class is the superclass for all dialogs in Resi.
  */
@@ -248,10 +247,10 @@
 	 */
 	public void setTopPanel(JPanel panel) {
 		panel.setBackground(Color.WHITE);
-		
+
 		panelTop.remove(panelGridTop);
 		panelTop.add(panel, BorderLayout.CENTER);
-		
+
 		panelTop.revalidate();
 	}
 
 
=== added file 'src/org/revager/gui/AbstractDialogPanel.java'
--- src/org/revager/gui/AbstractDialogPanel.java	1970-01-01 00:00:00 +0000
+++ src/org/revager/gui/AbstractDialogPanel.java	2010-05-26 20:44:25 +0000
@@ -0,0 +1,63 @@
+/* 
+ * Copyright 2009 Davide Casciato, Sandra Reich, Johannes Wettinger
+ * 
+ * This file is part of Resi.
+ *
+ * Resi is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Resi is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Resi. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package org.revager.gui;
+
+import javax.swing.JPanel;
+
+/**
+ * This class is the superclass for the assistant panels.
+ */
+@SuppressWarnings("serial")
+public abstract class AbstractDialogPanel extends JPanel {
+
+	private AbstractDialog parent;
+
+	/**
+	 * Returns the parent of this component.
+	 */
+	public AbstractDialog getParent() {
+		return parent;
+	}
+
+	/**
+	 * Sets the hint message in the parent.
+	 * 
+	 * @param hintText
+	 */
+	public void setHint(String hintText) {
+
+		parent.setMessage(hintText);
+
+	}
+
+	/**
+	 * Constructor with it's parent as parameter
+	 * 
+	 * @param parent
+	 */
+	public AbstractDialogPanel(AbstractDialog parent) {
+
+		super();
+
+		this.parent = parent;
+
+	}
+
+}
 
=== modified file 'src/org/revager/gui/MainFrame.java'
--- src/org/revager/gui/MainFrame.java	2010-01-31 17:32:35 +0000
+++ src/org/revager/gui/MainFrame.java	2010-05-26 20:44:25 +0000
@@ -96,7 +96,7 @@
 import org.revager.gui.actions.OpenProtocolFrameAction;
 import org.revager.gui.actions.SaveReviewAction;
 import org.revager.gui.actions.SaveReviewAsAction;
-import org.revager.gui.actions.SelectModeAction;
+import org.revager.gui.actions.assistant.OpenAssistantAction;
 import org.revager.gui.actions.attendee.AddAttendeeAction;
 import org.revager.gui.actions.attendee.EditAttendeeAction;
 import org.revager.gui.actions.attendee.RemoveAttendeeAction;
@@ -113,7 +113,6 @@
 import org.revager.tools.GUITools;
 import org.revager.tools.TreeTools;
 
-
 /**
  * This class represents the main frame.
  */
@@ -221,7 +220,6 @@
 	private JButton commentMeeting;
 	private JButton removeMeeting;
 
-
 	/*
 	 * Hint items
 	 */
@@ -605,7 +603,7 @@
 
 		meetingsTree.getSelectionModel().setSelectionMode(
 				TreeSelectionModel.SINGLE_TREE_SELECTION);
-		
+
 		treeScrollPane = new JScrollPane(meetingsTree);
 
 		/*
@@ -638,7 +636,7 @@
 				"meeting.edit"));
 		editMeeting.addActionListener(ActionRegistry.getInstance().get(
 				EditMeetingAction.class.getName()));
-		
+
 		meetingButtons.add(editMeeting);
 
 		commentMeeting = GUITools.newImageButton();
@@ -653,21 +651,22 @@
 		meetingButtons.add(commentMeeting);
 
 		editProtocol = GUITools.newImageButton();
-		editProtocol.setIcon(Data.getInstance().getIcon("protocolFrame_25x25_0.png"));
-		editProtocol.setRolloverIcon(Data.getInstance()
-				.getIcon("protocolFrame_25x25.png"));
+		editProtocol.setIcon(Data.getInstance().getIcon(
+				"protocolFrame_25x25_0.png"));
+		editProtocol.setRolloverIcon(Data.getInstance().getIcon(
+				"protocolFrame_25x25.png"));
 		editProtocol.setToolTipText(Data.getInstance().getLocaleStr(
 				"mainFrame.protocolMode"));
 		editProtocol.addActionListener(ActionRegistry.getInstance().get(
 				OpenProtocolFrameAction.class.getName()));
-		
+
 		meetingButtons.add(editProtocol);
-		
+
 		commentMeeting.setEnabled(false);
 		editMeeting.setEnabled(false);
 		removeMeeting.setEnabled(false);
 		editProtocol.setEnabled(false);
-		
+
 		attendees = new JLabel(Data.getInstance().getLocaleStr(
 				"mainFrame.meetings.attendees"));
 		attendees.setBorder(labelBorder);
@@ -964,7 +963,7 @@
 		tbShowAssistant.setToolTipText(Data.getInstance().getLocaleStr(
 				"menu.showAssistant"));
 		tbShowAssistant.addActionListener(ActionRegistry.getInstance().get(
-				SelectModeAction.class.getName()));
+				OpenAssistantAction.class.getName()));
 
 		addTopComponent(tbShowAssistant);
 
@@ -1007,11 +1006,11 @@
 				AddAttendeeAction.class.getName()));
 
 		addTopComponent(tbNewAttendee);
-		
+
 		tbNewMeeting = GUITools.newImageButton(Data.getInstance().getIcon(
-		"addMeeting_50x50_0.png"), Data.getInstance().getIcon(
-		"addMeeting_50x50.png"), ActionRegistry.getInstance().get(
-		AddMeetingAction.class.getName()));
+				"addMeeting_50x50_0.png"), Data.getInstance().getIcon(
+				"addMeeting_50x50.png"), ActionRegistry.getInstance().get(
+				AddMeetingAction.class.getName()));
 
 		addTopComponent(tbNewMeeting);
 
@@ -1110,7 +1109,7 @@
 		menuFile.setText(Data.getInstance().getLocaleStr("menu.file"));
 
 		fileSelectModeItem = new JMenuItem(ActionRegistry.getInstance().get(
-				SelectModeAction.class.getName()));
+				OpenAssistantAction.class.getName()));
 
 		menuFile.add(fileSelectModeItem);
 
@@ -2002,21 +2001,22 @@
 			editAttendee.setEnabled(false);
 		}
 
-		if(Data.getInstance().getMode().equals("instant")){
-			List<Meeting> meetingsList=Application.getInstance().getMeetingMgmt().getMeetings();
-			for(Meeting meet:meetingsList){
-				if(meet.isSetProtocol()==false && meetingsList.size()!=0){
+		if (Data.getInstance().getMode().equals("instant")) {
+			List<Meeting> meetingsList = Application.getInstance()
+					.getMeetingMgmt().getMeetings();
+			for (Meeting meet : meetingsList) {
+				if (meet.isSetProtocol() == false && meetingsList.size() != 0) {
 					addMeeting.setEnabled(false);
 					tbNewMeeting.setEnabled(false);
 					newMeetingItem.setEnabled(false);
-				}else{
+				} else {
 					addMeeting.setEnabled(true);
 					tbNewMeeting.setEnabled(true);
 					newMeetingItem.setEnabled(true);
 				}
 			}
 		}
-			
+
 		if (getSelectedMeeting() != null) {
 			commentMeeting.setEnabled(true);
 			editMeeting.setEnabled(true);
@@ -2181,7 +2181,7 @@
 		addAttendee.setEnabled(enabled);
 		attendeesTable.setEnabled(enabled);
 		editAspects.setEnabled(enabled);
-		
+
 		tbNewMeeting.setEnabled(enabled);
 		tbNewAttendee.setEnabled(enabled);
 		tbManageSeverities.setEnabled(enabled);
 
=== modified file 'src/org/revager/gui/UI.java'
--- src/org/revager/gui/UI.java	2010-01-31 17:32:35 +0000
+++ src/org/revager/gui/UI.java	2010-05-26 20:44:25 +0000
@@ -36,7 +36,7 @@
 import org.revager.app.model.Data;
 import org.revager.gui.aspects_manager.AspectsManagerFrame;
 import org.revager.gui.dialogs.AboutDialog;
-import org.revager.gui.dialogs.AssistantDialog;
+import org.revager.gui.dialogs.assistant.AssistantDialog;
 import org.revager.gui.dialogs.AttendeeDialog;
 import org.revager.gui.dialogs.CSVProfilesDialog;
 import org.revager.gui.dialogs.CreateInvitationsDialog;
 
=== modified file 'src/org/revager/gui/actions/ActionRegistry.java'
--- src/org/revager/gui/actions/ActionRegistry.java	2010-01-31 17:32:35 +0000
+++ src/org/revager/gui/actions/ActionRegistry.java	2010-05-26 20:44:25 +0000
@@ -23,6 +23,11 @@
 
 import javax.swing.Action;
 
+import org.revager.gui.actions.assistant.GoToAddAttPnlAction;
+import org.revager.gui.actions.assistant.GoToFirstScreenPnlAction;
+import org.revager.gui.actions.assistant.GoToOpenRevPnlAction;
+import org.revager.gui.actions.assistant.OpenAssistantAction;
+import org.revager.gui.actions.assistant.SelectLanguageAction;
 import org.revager.gui.actions.attendee.AddAttToProtAction;
 import org.revager.gui.actions.attendee.AddAttendeeAction;
 import org.revager.gui.actions.attendee.AddResiAttToProtAction;
@@ -48,7 +53,6 @@
 import org.revager.gui.actions.severities.PushSeverityUpAction;
 import org.revager.gui.actions.severities.RemoveSeverityAction;
 
-
 /**
  * The action registry contains all actions of this application, so they can
  * accessed easily.
@@ -125,9 +129,9 @@
 
 		register(new SaveReviewAsAction());
 		register(new SaveReviewAction());
-		register(new OpenScribeModeAction());
-		register(new OpenModeratorModeAction());
-		register(new InitializeMainFrameAction());
+		register(new GoToAddAttPnlAction());
+		register(new GoToOpenRevPnlAction());
+		register(new InitializeNewReviewAction());
 
 		register(new ManageSeveritiesAction());
 		register(new EditMeetingAction());
@@ -154,7 +158,7 @@
 		register(new OpenAspectsManagerAction());
 
 		register(new CommentMeetingAction());
-		register(new SelectModeAction());
+		register(new GoToFirstScreenPnlAction());
 		register(new SelectAttOutOfDirAction());
 		register(new OpenProtocolFrameAction());
 		register(new AddResiAttToProtAction());
@@ -164,5 +168,7 @@
 		register(new EditAttFromProtAction());
 		register(new OpenExpPDFDialogAction());
 		register(new OpenExpCSVDialogAction());
+		register(new SelectLanguageAction());
+		register(new OpenAssistantAction());
 	}
 }
 
=== renamed file 'src/org/revager/gui/actions/InitializeMainFrameAction.java' => 'src/org/revager/gui/actions/InitializeNewReviewAction.java'
--- src/org/revager/gui/actions/InitializeMainFrameAction.java	2010-01-31 17:32:35 +0000
+++ src/org/revager/gui/actions/InitializeNewReviewAction.java	2010-05-26 20:44:25 +0000
@@ -22,17 +22,18 @@
 
 import javax.swing.AbstractAction;
 
+import org.revager.app.model.Data;
 import org.revager.gui.UI;
-import org.revager.gui.dialogs.AssistantDialog;
-import org.revager.gui.workers.LoadReviewWorker;
+import org.revager.gui.actions.attendee.ConfirmAttendeeAction;
+import org.revager.gui.dialogs.AttendeeDialog;
+import org.revager.gui.dialogs.assistant.AssistantDialog;
 import org.revager.gui.workers.NewReviewWorker;
 
-
 /**
  * The Class InitializeMainFrameAction.
  */
 @SuppressWarnings("serial")
-public class InitializeMainFrameAction extends AbstractAction {
+public class InitializeNewReviewAction extends AbstractAction {
 
 	/*
 	 * (non-Javadoc)
@@ -42,19 +43,32 @@
 	 */
 	@Override
 	public void actionPerformed(ActionEvent e) {
-		AssistantDialog.Selection sel = UI.getInstance().getAssistantDialog()
-				.getSelected();
-
-		if (sel == AssistantDialog.Selection.NEW_REVIEW) {
+		if (Data.getInstance().getMode().equals("moderator")) {
 			new NewReviewWorker().execute();
-		} else if (sel == AssistantDialog.Selection.LOAD_REVIEW) {
-			new LoadReviewWorker(UI.getInstance().getAssistantDialog()
-					.getPath()).execute();
-		} else if (sel == AssistantDialog.Selection.MANAGE_ASPECTS) {
-			UI.getInstance().setStatus(UI.Status.NO_FILE_LOADED);
-
+			
 			UI.getInstance().getAssistantDialog().setVisible(false);
-			UI.getInstance().getAspectsManagerFrame().setVisible(true);
+		} else if (Data.getInstance().getMode().equals("instant")) {
+			AssistantDialog assistant = UI.getInstance().getAssistantDialog();
+			AttendeeDialog attDiag = UI.getInstance().getAttendeeDialog();
+
+			if (!attDiag.getNameTxtFld().getText().trim().equals("")) {
+				UI.getInstance().getAssistantDialog().setVisible(false);
+
+				ActionRegistry.getInstance().get(
+						ConfirmAttendeeAction.class.getName()).actionPerformed(
+						null);
+				
+				new NewReviewWorker().execute();
+			} else {
+				String message = "";
+				
+				message = Data.getInstance().getLocaleStr(
+						"attendeeDialog.message.noName");
+
+				assistant.setMessage(message);
+
+				attDiag.getNameTxtFld().setBorder(UI.MARKED_BORDER_INLINE);
+			}
 		}
 	}
 
 
=== modified file 'src/org/revager/gui/actions/OpenAspectsManagerAction.java'
--- src/org/revager/gui/actions/OpenAspectsManagerAction.java	2010-01-31 17:32:35 +0000
+++ src/org/revager/gui/actions/OpenAspectsManagerAction.java	2010-05-26 20:44:25 +0000
@@ -28,7 +28,6 @@
 import org.revager.app.model.Data;
 import org.revager.gui.UI;
 
-
 /**
  * The Class OpenAspectsManagerAction.
  */
@@ -57,7 +56,7 @@
 	public void actionPerformed(ActionEvent e) {
 		UI.getInstance().getAspectsManagerFrame().setSelectedReviewer(
 				UI.getInstance().getMainFrame().getSelectedAttendee());
-
+		UI.getInstance().getAssistantDialog().setVisible(false);
 		UI.getInstance().getAspectsManagerFrame().setVisible(true);
 	}
 
 
=== added directory 'src/org/revager/gui/actions/assistant'
=== renamed file 'src/org/revager/gui/actions/OpenScribeModeAction.java' => 'src/org/revager/gui/actions/assistant/GoToAddAttPnlAction.java'
--- src/org/revager/gui/actions/OpenScribeModeAction.java	2010-01-31 17:32:35 +0000
+++ src/org/revager/gui/actions/assistant/GoToAddAttPnlAction.java	2010-05-26 20:44:25 +0000
@@ -16,21 +16,23 @@
  * You should have received a copy of the GNU General Public License
  * along with Resi. If not, see <http://www.gnu.org/licenses/>.
  */
-package org.revager.gui.actions;
+package org.revager.gui.actions.assistant;
 
 import java.awt.event.ActionEvent;
 
 import javax.swing.AbstractAction;
 
-import org.revager.app.model.Data;
 import org.revager.gui.UI;
 
-
 /**
- * The Class OpenScribeModeAction.
+ * The Class GoToAddAttPnlAction. Calling this action will set the assistant to
+ * the AddAttendeePanel.
+ * 
+ * @author D.Casciato
+ * 
  */
 @SuppressWarnings("serial")
-public class OpenScribeModeAction extends AbstractAction {
+public class GoToAddAttPnlAction extends AbstractAction {
 
 	/*
 	 * (non-Javadoc)
@@ -40,8 +42,11 @@
 	 */
 	@Override
 	public void actionPerformed(ActionEvent e) {
-		Data.getInstance().setMode("scribe");
-		UI.getInstance().getAssistantDialog().setSelectReview();
+		UI.getInstance().getAssistantDialog().setCurrentPnl(
+				UI.getInstance().getAssistantDialog().getAddAttendeePanel());
+		UI.getInstance().getAssistantDialog().updateMessage();
+		UI.getInstance().getAssistantDialog().updateContents();
+		UI.getInstance().getAssistantDialog().updateWizardBttns();
 	}
 
 }
 
=== renamed file 'src/org/revager/gui/actions/SelectModeAction.java' => 'src/org/revager/gui/actions/assistant/GoToFirstScreenPnlAction.java'
--- src/org/revager/gui/actions/SelectModeAction.java	2010-01-31 17:32:35 +0000
+++ src/org/revager/gui/actions/assistant/GoToFirstScreenPnlAction.java	2010-05-26 20:44:25 +0000
@@ -16,39 +16,23 @@
  * You should have received a copy of the GNU General Public License
  * along with Resi. If not, see <http://www.gnu.org/licenses/>.
  */
-package org.revager.gui.actions;
+package org.revager.gui.actions.assistant;
 
-import java.awt.Toolkit;
 import java.awt.event.ActionEvent;
-import java.awt.event.KeyEvent;
 
 import javax.swing.AbstractAction;
-import javax.swing.Action;
-import javax.swing.KeyStroke;
 
-import org.revager.app.model.Data;
 import org.revager.gui.UI;
 
-
 /**
- * The Class SelectModeAction.
+ * The Class GoToFirstScreenPnlAction. Calling this action will set the assistant to
+ * the FirstScreenPanel.
+ * 
+ * @author D.Casciato
+ *
  */
 @SuppressWarnings("serial")
-public class SelectModeAction extends AbstractAction {
-
-	/**
-	 * Instantiates a new select mode action.
-	 */
-	public SelectModeAction() {
-		super();
-
-		putValue(Action.SMALL_ICON, Data.getInstance().getIcon(
-				"menuAssistant_16x16.png"));
-		putValue(Action.NAME, Data.getInstance().getLocaleStr(
-				"menu.showAssistant"));
-		putValue(ACCELERATOR_KEY, KeyStroke.getKeyStroke(KeyEvent.VK_M, Toolkit
-				.getDefaultToolkit().getMenuShortcutKeyMask()));
-	}
+public class GoToFirstScreenPnlAction extends AbstractAction {
 
 	/*
 	 * (non-Javadoc)
@@ -58,8 +42,11 @@
 	 */
 	@Override
 	public void actionPerformed(ActionEvent e) {
-		UI.getInstance().getAssistantDialog().setSelectMode();
-		UI.getInstance().getAssistantDialog().setVisible(true);
+		UI.getInstance().getAssistantDialog().setCurrentPnl(
+				UI.getInstance().getAssistantDialog().getFirstScreenPanel());
+		UI.getInstance().getAssistantDialog().updateMessage();
+		UI.getInstance().getAssistantDialog().updateContents();
+		UI.getInstance().getAssistantDialog().updateWizardBttns();
 	}
 
 }
 
=== renamed file 'src/org/revager/gui/actions/OpenModeratorModeAction.java' => 'src/org/revager/gui/actions/assistant/GoToOpenRevPnlAction.java'
--- src/org/revager/gui/actions/OpenModeratorModeAction.java	2010-01-31 17:32:35 +0000
+++ src/org/revager/gui/actions/assistant/GoToOpenRevPnlAction.java	2010-05-26 20:44:25 +0000
@@ -16,21 +16,23 @@
  * You should have received a copy of the GNU General Public License
  * along with Resi. If not, see <http://www.gnu.org/licenses/>.
  */
-package org.revager.gui.actions;
+package org.revager.gui.actions.assistant;
 
 import java.awt.event.ActionEvent;
 
 import javax.swing.AbstractAction;
 
-import org.revager.app.model.Data;
 import org.revager.gui.UI;
 
-
 /**
- * The Class OpenModeratorModeAction.
+ * The Class GoToOpenReviewPanel. Calling this action will set the assistant to
+ * the OpenReviewPanel.
+ * 
+ * @author D.Casciato
+ *
  */
 @SuppressWarnings("serial")
-public class OpenModeratorModeAction extends AbstractAction {
+public class GoToOpenRevPnlAction extends AbstractAction {
 
 	/*
 	 * (non-Javadoc)
@@ -40,8 +42,13 @@
 	 */
 	@Override
 	public void actionPerformed(ActionEvent e) {
-		Data.getInstance().setMode("moderator");
-		UI.getInstance().getAssistantDialog().setSelectReview();
+		
+		UI.getInstance().getAssistantDialog().setCurrentPnl(
+				UI.getInstance().getAssistantDialog().getOpenReviewPanel());
+		UI.getInstance().getAssistantDialog().updateMessage();
+		UI.getInstance().getAssistantDialog().updateContents();
+		UI.getInstance().getAssistantDialog().updateWizardBttns();
+		
 	}
 
 }
 
=== added file 'src/org/revager/gui/actions/assistant/OpenAssistantAction.java'
--- src/org/revager/gui/actions/assistant/OpenAssistantAction.java	1970-01-01 00:00:00 +0000
+++ src/org/revager/gui/actions/assistant/OpenAssistantAction.java	2010-05-26 20:44:25 +0000
@@ -0,0 +1,70 @@
+/* 
+ * Copyright 2009 Davide Casciato, Sandra Reich, Johannes Wettinger
+ * 
+ * This file is part of Resi.
+ *
+ * Resi is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Resi is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Resi. If not, see <http://www.gnu.org/licenses/>.
+ */
+package org.revager.gui.actions.assistant;
+
+import java.awt.Toolkit;
+import java.awt.event.ActionEvent;
+import java.awt.event.KeyEvent;
+
+import javax.swing.AbstractAction;
+import javax.swing.Action;
+import javax.swing.KeyStroke;
+
+import org.revager.app.model.Data;
+import org.revager.gui.UI;
+
+
+@SuppressWarnings("serial")
+/**
+ * The class OpenAssistantAction.
+ * 
+ */
+public class OpenAssistantAction extends AbstractAction{
+
+	/**
+	 * Opens the AssistantDialog.
+	 */
+	public OpenAssistantAction() {
+		super();
+
+		putValue(Action.SMALL_ICON, Data.getInstance().getIcon(
+				"menuAssistant_16x16.png"));
+		putValue(Action.NAME, Data.getInstance().getLocaleStr(
+				"menu.showAssistant"));
+		putValue(ACCELERATOR_KEY, KeyStroke.getKeyStroke(KeyEvent.VK_M, Toolkit
+				.getDefaultToolkit().getMenuShortcutKeyMask()));
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see
+	 * java.awt.event.ActionListener#actionPerformed(java.awt.event.ActionEvent)
+	 */
+	@Override
+	public void actionPerformed(ActionEvent e) {
+		UI.getInstance().getAssistantDialog().setCurrentPnl(
+		UI.getInstance().getAssistantDialog().getFirstScreenPanel());
+		UI.getInstance().getAssistantDialog().updateMessage();
+		UI.getInstance().getAssistantDialog().updateContents();
+		UI.getInstance().getAssistantDialog().updateWizardBttns();
+		UI.getInstance().getAssistantDialog().setVisible(true);
+	}
+
+}
 \ No newline at end of file
 
=== added file 'src/org/revager/gui/actions/assistant/SelectLanguageAction.java'
--- src/org/revager/gui/actions/assistant/SelectLanguageAction.java	1970-01-01 00:00:00 +0000
+++ src/org/revager/gui/actions/assistant/SelectLanguageAction.java	2010-05-26 20:44:25 +0000
@@ -0,0 +1,73 @@
+/* 
+ * Copyright 2009 Davide Casciato, Sandra Reich, Johannes Wettinger
+ * 
+ * This file is part of Resi.
+ *
+ * Resi is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Resi is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Resi. If not, see <http://www.gnu.org/licenses/>.
+ */
+package org.revager.gui.actions.assistant;
+
+import java.awt.event.ActionEvent;
+
+import javax.swing.AbstractAction;
+
+import org.revager.app.model.ApplicationData;
+import org.revager.app.model.Data;
+import org.revager.app.model.DataException;
+import org.revager.app.model.appdata.AppSettingKey;
+import org.revager.gui.UI;
+import org.revager.gui.dialogs.assistant.LanguagePopupWindow;
+
+/**
+ * The Class GoToAddAttPnlAction. Calling this action will open a pop-up to
+ * select a language. After confirming you'll need to restart the application to
+ * activate the language changes.
+ * 
+ * @author D.Casciato
+ *
+ */
+@SuppressWarnings("serial")
+public class SelectLanguageAction extends AbstractAction {
+
+	private LanguagePopupWindow popup;
+	private ApplicationData appData = Data.getInstance().getAppData();
+
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see
+	 * java.awt.event.ActionListener#actionPerformed(java.awt.event.ActionEvent)
+	 */
+	@Override
+	public void actionPerformed(ActionEvent arg0) {
+
+		if (UI.getInstance().getAssistantDialog().isVisible())
+			popup = new LanguagePopupWindow(UI.getInstance()
+					.getAssistantDialog(), Data.getInstance().getLocaleStr(
+					"assistantDialog.selectLanguage"));
+		popup.setVisible(true);
+
+		if (popup.getButtonClicked() == LanguagePopupWindow.ButtonClicked.OK) {
+			try {
+				appData.setSetting(AppSettingKey.APP_LANGUAGE, popup
+						.getSelectedLanguage());
+				UI.getInstance().getAssistantDialog().setMessage(
+						Data.getInstance().getLocaleStr(
+								"settingsDialog.general.langHintRestart"));
+			} catch (DataException e) {
+				e.printStackTrace();
+			}
+		}
+	}
+}
 
=== modified file 'src/org/revager/gui/actions/attendee/AddResiAttToProtAction.java'
--- src/org/revager/gui/actions/attendee/AddResiAttToProtAction.java	2010-01-31 17:32:35 +0000
+++ src/org/revager/gui/actions/attendee/AddResiAttToProtAction.java	2010-05-26 20:44:25 +0000
@@ -29,7 +29,6 @@
 import org.revager.gui.UI;
 import org.revager.gui.protocol.AddResiAttToProtPopupWindow;
 
-
 /**
  * The Class AddResiAttToProtAction.
  */
@@ -59,7 +58,7 @@
 
 			localAtt = Application.getInstance().getAttendeeMgmt().getAttendee(
 					Integer.parseInt(attId));
-			
+
 			Application.getInstance().getProtocolMgmt().addAttendee(localAtt,
 					prep, prot);
 			UI.getInstance().getProtocolFrame().getPatm().setProtocol(prot);
 
=== modified file 'src/org/revager/gui/actions/attendee/SelectAttOutOfDirAction.java'
--- src/org/revager/gui/actions/attendee/SelectAttOutOfDirAction.java	2010-01-31 17:32:35 +0000
+++ src/org/revager/gui/actions/attendee/SelectAttOutOfDirAction.java	2010-05-26 20:44:25 +0000
@@ -27,13 +27,13 @@
 import org.revager.gui.DirectoryPopupWindow;
 import org.revager.gui.UI;
 
-
 /**
  * The Class SelectAttOutOfDirAction.
  */
 @SuppressWarnings("serial")
 public class SelectAttOutOfDirAction extends AbstractAction {
 	private DirectoryPopupWindow popup;
+
 	/*
 	 * (non-Javadoc)
 	 * 
@@ -42,11 +42,11 @@
 	 */
 	@Override
 	public void actionPerformed(ActionEvent ev) {
-		if(UI.getInstance().getAttendeeDialog().isVisible())
+		if (UI.getInstance().getAttendeeDialog().isVisible())
 			popup = new DirectoryPopupWindow(UI.getInstance()
-				.getAttendeeDialog(), Data.getInstance().getLocaleStr(
-				"popup.directory.title"));
-		else if(UI.getInstance().getAssistantDialog().isVisible())
+					.getAttendeeDialog(), Data.getInstance().getLocaleStr(
+					"popup.directory.title"));
+		else if (UI.getInstance().getAssistantDialog().isVisible())
 			popup = new DirectoryPopupWindow(UI.getInstance()
 					.getAssistantDialog(), Data.getInstance().getLocaleStr(
 					"popup.directory.title"));
@@ -56,12 +56,9 @@
 			if (popup.getAttendeeBx().getSelectedItem() != null) {
 				AppAttendee appAtt = ((AppAttendee) popup.getAttendeeBx()
 						.getSelectedItem());
-				
-				if(UI.getInstance().getAttendeeDialog().isVisible())
+
 				UI.getInstance().getAttendeeDialog().setCurrentAppAttendee(
 						appAtt);
-				else if(UI.getInstance().getAssistantDialog().isVisible())
-					UI.getInstance().getAssistantDialog().setCurrentAppAttendee(appAtt);
 			}
 		}
 	}
 
=== added file 'src/org/revager/gui/actions/popup/LanguagePopupWindowAction.java'
--- src/org/revager/gui/actions/popup/LanguagePopupWindowAction.java	1970-01-01 00:00:00 +0000
+++ src/org/revager/gui/actions/popup/LanguagePopupWindowAction.java	2010-05-26 20:44:25 +0000
@@ -0,0 +1,35 @@
+package org.revager.gui.actions.popup;
+
+import java.awt.event.ActionEvent;
+
+import javax.swing.AbstractAction;
+
+import org.revager.gui.dialogs.assistant.LanguagePopupWindow;
+import org.revager.gui.dialogs.assistant.LanguagePopupWindow.ButtonClicked;
+
+@SuppressWarnings("serial")
+public class LanguagePopupWindowAction extends AbstractAction {
+
+	private LanguagePopupWindow popupWindow = null;
+
+	private ButtonClicked buttonClick = null;
+
+	public LanguagePopupWindowAction(LanguagePopupWindow popupWin,
+			ButtonClicked buttonClk) {
+		this.popupWindow = popupWin;
+		this.buttonClick = buttonClk;
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see
+	 * java.awt.event.ActionListener#actionPerformed(java.awt.event.ActionEvent)
+	 */
+	@Override
+	public void actionPerformed(ActionEvent e) {
+		popupWindow.setButtonClicked(buttonClick);
+		popupWindow.setVisible(false);
+	}
+
+}
 
=== removed file 'src/org/revager/gui/dialogs/AssistantDialog.java'
--- src/org/revager/gui/dialogs/AssistantDialog.java	2010-01-31 17:32:35 +0000
+++ src/org/revager/gui/dialogs/AssistantDialog.java	1970-01-01 00:00:00 +0000
@@ -1,1042 +0,0 @@
-/* 
- * Copyright 2009 Davide Casciato, Sandra Reich, Johannes Wettinger
- * 
- * This file is part of Resi.
- *
- * Resi is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Resi is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with Resi. If not, see <http://www.gnu.org/licenses/>.
- */
-package org.revager.gui.dialogs;
-
-import java.awt.BorderLayout;
-import java.awt.Color;
-import java.awt.Dimension;
-import java.awt.Font;
-import java.awt.Frame;
-import java.awt.GridBagConstraints;
-import java.awt.GridBagLayout;
-import java.awt.GridLayout;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-import java.awt.event.FocusEvent;
-import java.awt.event.FocusListener;
-import java.awt.event.ItemEvent;
-import java.awt.event.ItemListener;
-import java.awt.event.KeyEvent;
-import java.awt.event.KeyListener;
-import java.awt.event.MouseEvent;
-import java.awt.event.MouseListener;
-import java.io.File;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Vector;
-
-import javax.swing.BorderFactory;
-import javax.swing.ButtonGroup;
-import javax.swing.ImageIcon;
-import javax.swing.JButton;
-import javax.swing.JComboBox;
-import javax.swing.JDialog;
-import javax.swing.JLabel;
-import javax.swing.JList;
-import javax.swing.JOptionPane;
-import javax.swing.JPanel;
-import javax.swing.JRadioButton;
-import javax.swing.JScrollPane;
-import javax.swing.JTable;
-import javax.swing.JTextArea;
-import javax.swing.JTextField;
-import javax.swing.ListSelectionModel;
-import javax.swing.SwingWorker;
-import javax.swing.border.MatteBorder;
-import javax.swing.event.ChangeEvent;
-import javax.swing.event.ChangeListener;
-import javax.swing.event.ListSelectionEvent;
-import javax.swing.event.ListSelectionListener;
-
-import org.revager.app.Application;
-import org.revager.app.ResiFileFilter;
-import org.revager.app.model.Data;
-import org.revager.app.model.DataException;
-import org.revager.app.model.appdata.AppAttendee;
-import org.revager.app.model.schema.Attendee;
-import org.revager.app.model.schema.Role;
-import org.revager.gui.AbstractDialog;
-import org.revager.gui.StrengthPopupWindow;
-import org.revager.gui.UI;
-import org.revager.gui.StrengthPopupWindow.ButtonClicked;
-import org.revager.gui.actions.ActionRegistry;
-import org.revager.gui.actions.ExitAction;
-import org.revager.gui.actions.InitializeMainFrameAction;
-import org.revager.gui.actions.OpenModeratorModeAction;
-import org.revager.gui.actions.OpenScribeModeAction;
-import org.revager.gui.actions.attendee.SelectAttOutOfDirAction;
-import org.revager.gui.helpers.FileChooser;
-import org.revager.gui.models.StrengthTableModel;
-import org.revager.gui.workers.LoadStdCatalogsWorker;
-import org.revager.tools.GUITools;
-
-
-/**
- * The Class AssistantDialog.
- */
-@SuppressWarnings("serial")
-public class AssistantDialog extends AbstractDialog {
-
-	/**
-	 * The Enum Selection.
-	 */
-	public enum Selection {
-		NEW_REVIEW, LOAD_REVIEW, MANAGE_ASPECTS;
-	}
-
-	private Selection selected = Selection.NEW_REVIEW;
-
-	/**
-	 * Gets the selected.
-	 * 
-	 * @return the selected
-	 */
-	public Selection getSelected() {
-		return selected;
-	}
-
-	private GridBagLayout gbl = new GridBagLayout();
-	private JPanel basePanel = new JPanel(gbl);
-
-	private JButton buttonExit = new JButton(Data.getInstance().getLocaleStr(
-			"closeApplication"));
-	private JButton buttonBack = new JButton(Data.getInstance().getLocaleStr(
-			"back"));
-	private JButton buttonConfirm = new JButton(Data.getInstance()
-			.getLocaleStr("confirm"));
-
-	private JList listLastRevs;
-
-	private JTextField pathTxtFld = new JTextField();
-
-	private final ImageIcon ICON_BROWSE = Data.getInstance().getIcon(
-			"buttonBrowse_22x22_0.png");
-	private final ImageIcon ICON_BROWSE_ROLLOVER = Data.getInstance().getIcon(
-			"buttonBrowse_22x22.png");
-	private JButton buttonBrowse = GUITools.newImageButton(ICON_BROWSE,
-			ICON_BROWSE_ROLLOVER);
-	private Level dialogLevel;
-	private JLabel nameLabel;
-	private JLabel contactLabel;
-	private JLabel roleLabel;
-	private JLabel strengthLabel;
-	private JTextField nameTxtFld;
-	private JTextArea contactTxtArea;
-	private JComboBox roleCmbBx;
-	private JTable strengthTbl;
-
-	private JButton directoryBttn;
-	private JButton addStrength = null;
-	private JButton removeStrength = null;
-
-	private StrengthTableModel stm = null;
-	private List<String> strengthList = null;
-	private JScrollPane contactScrllPn;
-	private JPanel buttonPanel = null;
-
-	private AppAttendee currentAppAttendee;
-	//private Attendee currentAttendee;
-
-	public enum Level {
-		LEVEL1, LEVEL2, LEVEL3
-	};
-
-	private boolean nameMissing;
-
-	/**
-	 * Returns if name is missing or not
-	 * 
-	 * @return missing
-	 */
-	public boolean isNameMissing() {
-		return nameMissing;
-	}
-
-	/**
-	 * Gets the path.
-	 * 
-	 * @return the path
-	 */
-	public String getPath() {
-		return pathTxtFld.getText();
-	}
-
-	/**
-	 * Sets the path.
-	 * 
-	 * @param path
-	 *            the new path
-	 */
-	public void setPath(String path) {
-		pathTxtFld.setText(path);
-	}
-
-	/**
-	 * Sets the select mode.
-	 */
-	public void setSelectMode() {
-		dialogLevel = Level.LEVEL1;
-
-		setDescription(Data.getInstance().getLocaleStr(
-				"assistantDialog.selectModeDescription"));
-
-		basePanel.removeAll();
-
-		basePanel.setLayout(gbl);
-
-		buttonConfirm.setEnabled(false);
-		buttonConfirm.setIcon(Data.getInstance().getIcon("buttonOk_16x16.png"));
-		buttonConfirm.setText(Data.getInstance().getLocaleStr("confirm"));
-
-		buttonBack.setEnabled(false);
-
-		JButton moderator = GUITools.newImageButton();
-		moderator
-				.setIcon(Data.getInstance().getIcon("moderator_128x128_0.png"));
-		moderator.setRolloverIcon(Data.getInstance().getIcon(
-				"moderator_128x128.png"));
-		moderator.addActionListener(ActionRegistry.getInstance().get(
-				OpenModeratorModeAction.class.getName()));
-
-		JButton scribe = GUITools.newImageButton();
-		scribe.setIcon(Data.getInstance().getIcon("scribe_128x128_0.png"));
-		scribe
-				.setRolloverIcon(Data.getInstance().getIcon(
-						"scribe_128x128.png"));
-		scribe.addActionListener(ActionRegistry.getInstance().get(
-				OpenScribeModeAction.class.getName()));
-
-		JButton instantReview = GUITools.newImageButton(Data.getInstance()
-				.getIcon("instantReview_128x128_0.png"), Data.getInstance()
-				.getIcon("instantReview_128x128.png"));
-		instantReview.addActionListener(new ActionListener() {
-
-			@Override
-			public void actionPerformed(ActionEvent e) {
-				Data.getInstance().setMode("instant");
-				UI.getInstance().getAssistantDialog().setSelectReview();
-			}
-		});
-		instantReview.setEnabled(true);
-
-		JLabel scribeLabel = new JLabel(Data.getInstance().getLocaleStr(
-				"mode.scribe"));
-		JLabel moderatorLabel = new JLabel(Data.getInstance().getLocaleStr(
-				"mode.moderator"));
-		JLabel instantRevLabel = new JLabel(Data.getInstance().getLocaleStr(
-				"mode.instant"));
-
-		buttonExit.addActionListener(ActionRegistry.getInstance().get(
-				ExitAction.class.getName()));
-
-		GUITools
-				.addComponent(basePanel, gbl, moderator, 0, 0, 1, 1, 1.0, 1.0,
-						0, 20, 0, 20, GridBagConstraints.NONE,
-						GridBagConstraints.SOUTH);
-		GUITools.addComponent(basePanel, gbl, moderatorLabel, 0, 1, 1, 1, 1.0,
-				1.0, 0, 20, 0, 20, GridBagConstraints.NONE,
-				GridBagConstraints.NORTH);
-		GUITools.addComponent(basePanel, gbl, instantReview, 1, 0, 1, 1, 1.0,
-				1.0, 0, 20, 0, 20, GridBagConstraints.NONE,
-				GridBagConstraints.SOUTH);
-		GUITools.addComponent(basePanel, gbl, instantRevLabel, 1, 1, 1, 1, 1.0,
-				1.0, 0, 20, 0, 20, GridBagConstraints.NONE,
-				GridBagConstraints.NORTH);
-		GUITools.addComponent(basePanel, gbl, scribe, 2, 0, 1, 1, 1.0, 1.0, 0,
-				20, 0, 20, GridBagConstraints.NONE, GridBagConstraints.SOUTH);
-		GUITools.addComponent(basePanel, gbl, scribeLabel, 2, 1, 1, 1, 1.0,
-				1.0, 0, 20, 0, 20, GridBagConstraints.NONE,
-				GridBagConstraints.NORTH);
-
-		buttonConfirm.requestFocusInWindow();
-
-		basePanel.repaint();
-
-		pack();
-	}
-
-	/**
-	 * Sets the select review.
-	 */
-	public void setSelectReview() {
-
-		dialogLevel = Level.LEVEL2;
-
-		setDescription(Data.getInstance().getLocaleStr(
-				"assistantDialog.selectReviewDescription"));
-
-		basePanel.removeAll();
-
-		buttonBack.setEnabled(true);
-		buttonConfirm.setEnabled(true);
-
-		final JLabel labelSelectReview = new JLabel(Data.getInstance()
-				.getLocaleStr("assistantDialog.selectReview")
-				+ ":");
-		final JLabel labelLastReviews = new JLabel(Data.getInstance()
-				.getLocaleStr("assistantDialog.lastReviews")
-				+ ":");
-
-		pathTxtFld.setBorder(UI.STANDARD_BORDER_INLINE);
-
-		/*
-		 * List of last reviews
-		 */
-		listLastRevs = new JList();
-		listLastRevs.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
-		listLastRevs.setSelectedIndex(0);
-		listLastRevs.setListData(getLastReviews());
-		listLastRevs.setBorder(UI.STANDARD_BORDER);
-		listLastRevs.setFont(listLastRevs.getFont().deriveFont(Font.PLAIN));
-		listLastRevs.addListSelectionListener(new ListSelectionListener() {
-			@Override
-			public void valueChanged(ListSelectionEvent e) {
-				List<String> lastRevs;
-				try {
-					lastRevs = Data.getInstance().getAppData().getLastReviews();
-					if (listLastRevs.getSelectedIndex() > -1) {
-						String selectedReview = lastRevs.get(listLastRevs
-								.getSelectedIndex());
-
-						if (!pathTxtFld.getText().equals(selectedReview)) {
-							pathTxtFld.setText(selectedReview);
-						}
-					}
-				} catch (DataException exc) {
-					JOptionPane.showMessageDialog(null, GUITools
-							.getMessagePane(exc.getMessage()), Data
-							.getInstance().getLocaleStr("error"),
-							JOptionPane.ERROR_MESSAGE);
-				}
-			}
-		});
-
-		ButtonGroup choice = new ButtonGroup();
-
-		final JRadioButton newReview = new JRadioButton(Data.getInstance()
-				.getLocaleStr("menu.file.newReview"), true);
-		choice.add(newReview);
-
-		final JRadioButton openReview = new JRadioButton(Data.getInstance()
-				.getLocaleStr("menu.file.openReview"));
-		choice.add(openReview);
-
-		final JRadioButton manageAspects = new JRadioButton(Data.getInstance()
-				.getLocaleStr("assistantDialog.manageCatalogs"));
-		choice.add(manageAspects);
-
-		openReview.setEnabled(Data.getInstance().getModeParam(
-				"ableToOpenReview"));
-		openReview.addChangeListener(new ChangeListener() {
-			@Override
-			public void stateChanged(ChangeEvent e) {
-				if (openReview.isSelected()) {
-					pathTxtFld.setEnabled(true);
-					buttonBrowse.setEnabled(true);
-					listLastRevs.setEnabled(true);
-					selected = Selection.LOAD_REVIEW;
-					labelSelectReview.setEnabled(true);
-					labelLastReviews.setEnabled(true);
-				}
-			}
-		});
-
-		newReview.setEnabled(Data.getInstance().getModeParam(
-				"ableToCreateNewReview"));
-		newReview.addChangeListener(new ChangeListener() {
-			@Override
-			public void stateChanged(ChangeEvent e) {
-				if (newReview.isSelected()) {
-					pathTxtFld.setEnabled(false);
-					buttonBrowse.setEnabled(false);
-					listLastRevs.setEnabled(false);
-					selected = Selection.NEW_REVIEW;
-					labelSelectReview.setEnabled(false);
-					labelLastReviews.setEnabled(false);
-				}
-			}
-		});
-
-		manageAspects.setEnabled(Data.getInstance().getModeParam(
-				"ableToUseAspectsManager"));
-		manageAspects.addChangeListener(new ChangeListener() {
-			@Override
-			public void stateChanged(ChangeEvent e) {
-				if (manageAspects.isSelected()) {
-					pathTxtFld.setEnabled(false);
-					buttonBrowse.setEnabled(false);
-					listLastRevs.setEnabled(false);
-					selected = Selection.MANAGE_ASPECTS;
-					labelSelectReview.setEnabled(false);
-					labelLastReviews.setEnabled(false);
-				}
-			}
-		});
-
-		/*
-		 * Set start selection
-		 */
-		if (Data.getInstance().getModeParam("ableToCreateNewReview")) {
-			newReview.setSelected(true);
-			selected = Selection.NEW_REVIEW;
-		} else if (Data.getInstance().getModeParam("ableToOpenReview")) {
-			openReview.setSelected(true);
-			selected = Selection.LOAD_REVIEW;
-		}
-
-		pathTxtFld.setEnabled(openReview.isSelected());
-		buttonBrowse.setEnabled(openReview.isSelected());
-		listLastRevs.setEnabled(openReview.isSelected());
-		labelSelectReview.setEnabled(openReview.isSelected());
-		labelLastReviews.setEnabled(openReview.isSelected());
-
-		// container,layout, component,gx,gy,gwidth,gheight,weightx,weighty, t,
-		// l, b, r, a, i
-		GUITools.addComponent(basePanel, gbl, manageAspects, 0, 0, 1, 1, 0, 0,
-				0, 0, 0, 0, GridBagConstraints.NONE,
-				GridBagConstraints.NORTHWEST);
-		GUITools.addComponent(basePanel, gbl, newReview, 0, 1, 1, 1, 0, 0, 10,
-				0, 0, 0, GridBagConstraints.NONE, GridBagConstraints.NORTHWEST);
-		GUITools.addComponent(basePanel, gbl, openReview, 0, 2, 1, 1, 0, 0, 10,
-				0, 0, 0, GridBagConstraints.NONE, GridBagConstraints.NORTHWEST);
-		GUITools.addComponent(basePanel, gbl, labelSelectReview, 0, 3, 1, 1, 0,
-				0, 0, 20, 0, 0, GridBagConstraints.NONE,
-				GridBagConstraints.WEST);
-		GUITools.addComponent(basePanel, gbl, pathTxtFld, 1, 3, 2, 1, 1.0, 0.3,
-				20, 0, 20, 0, GridBagConstraints.HORIZONTAL,
-				GridBagConstraints.WEST);
-		GUITools.addComponent(basePanel, gbl, buttonBrowse, 3, 3, 1, 1, 0, 0,
-				0, 0, 0, 0, GridBagConstraints.NONE, GridBagConstraints.WEST);
-		GUITools.addComponent(basePanel, gbl, labelLastReviews, 0, 4, 1, 1,
-				0.0, 0.0, 0, 20, 0, 0, GridBagConstraints.NONE,
-				GridBagConstraints.WEST);
-		GUITools.addComponent(basePanel, gbl, listLastRevs, 2, 4, 2, 2, 1.0,
-				1.0, 0, 0, 0, 0, GridBagConstraints.BOTH,
-				GridBagConstraints.NORTHWEST);
-
-		buttonConfirm.requestFocusInWindow();
-
-		basePanel.repaint();
-
-		pack();
-	}
-
-	/**
-	 * Changes to level3 view of the dialog
-	 */
-	public void setAddAttToInstRev() {
-		dialogLevel = Level.LEVEL3;
-
-		setDescription(Data.getInstance().getLocaleStr(
-				"addYourself.description"));
-
-		basePanel.removeAll();
-
-		buttonBack.setEnabled(true);
-		buttonConfirm.setEnabled(true);
-
-		nameLabel = new JLabel(Data.getInstance().getLocaleStr("attendee.name"));
-		contactLabel = new JLabel(Data.getInstance().getLocaleStr(
-				"attendee.contact"));
-		roleLabel = new JLabel(Data.getInstance().getLocaleStr("attendee.role"));
-		strengthLabel = new JLabel(Data.getInstance().getLocaleStr(
-				"attendee.priorities"));
-
-		nameTxtFld = new JTextField();
-		contactTxtArea = new JTextArea();
-		contactTxtArea.addFocusListener(focusListener);
-		contactScrllPn = GUITools.setIntoScrllPn(contactTxtArea);
-		roleCmbBx = new JComboBox();
-		roleCmbBx.addFocusListener(focusListener);
-
-		for (Role x : Role.values()) {
-			String roleString = "role.".concat(x.value());
-			roleCmbBx.addItem(Data.getInstance().getLocaleStr(roleString));
-		}
-
-		roleCmbBx.addItemListener(new ItemListener() {
-			@Override
-			public void itemStateChanged(ItemEvent ev) {
-				updateStrengthTable();
-			}
-		});
-
-		// roleCmbBx.setSelectedItem(Data.getInstance().getLocaleStr(
-		// "role." + Role.REVIEWER.toString().toLowerCase()));
-
-		strengthTbl = GUITools.newStandardTable(null, false);
-
-		directoryBttn = GUITools.newImageButton(Data.getInstance().getIcon(
-				"directory_25x25_0.png"), Data.getInstance().getIcon(
-				"directory_25x25.png"));
-		directoryBttn.setToolTipText(Data.getInstance().getLocaleStr(
-				"attendee.directory"));
-		directoryBttn.addActionListener(ActionRegistry.getInstance().get(
-				SelectAttOutOfDirAction.class.getName()));
-		buttonPanel = new JPanel(new GridLayout(3, 1));
-
-		strengthTbl.addFocusListener(focusListener);
-		strengthTbl.addMouseListener(new MouseListener() {
-			@Override
-			public void mouseClicked(MouseEvent e) {
-				updateStrengthButtons();
-			}
-
-			@Override
-			public void mouseEntered(MouseEvent e) {
-			}
-
-			@Override
-			public void mouseExited(MouseEvent e) {
-			}
-
-			@Override
-			public void mousePressed(MouseEvent e) {
-			}
-
-			@Override
-			public void mouseReleased(MouseEvent e) {
-			}
-		});
-
-		addStrength = GUITools.newImageButton();
-		addStrength.setIcon(Data.getInstance().getIcon("add_25x25_0.png"));
-		addStrength
-				.setRolloverIcon(Data.getInstance().getIcon("add_25x25.png"));
-		addStrength.setToolTipText(Data.getInstance().getLocaleStr(
-				"attendeeDialog.addStrength"));
-
-		addStrength.addActionListener(new ActionListener() {
-			@Override
-			public void actionPerformed(ActionEvent ev) {
-				final String title = Data.getInstance().getLocaleStr(
-						"popup.addStrength.title");
-
-				SwingWorker<Void, Void> showPopupWorker = new SwingWorker<Void, Void>() {
-					@Override
-					protected Void doInBackground() throws Exception {
-						StrengthPopupWindow popup = new StrengthPopupWindow(UI
-								.getInstance().getAssistantDialog(), title);
-
-						/*
-						 * Import the standard catalogs, if no catalogs exist in
-						 * the database
-						 */
-						try {
-							if (Data.getInstance().getAppData()
-									.getNumberOfCatalogs() == 0) {
-								switchToProgressMode(Data
-										.getInstance()
-										.getLocaleStr("status.importingCatalog"));
-
-								LoadStdCatalogsWorker catalogWorker = new LoadStdCatalogsWorker();
-
-								catalogWorker.execute();
-
-								while (!catalogWorker.isDone()
-										&& !catalogWorker.isCancelled()) {
-									Thread.sleep(500);
-								}
-
-								switchToEditMode();
-							}
-						} catch (Exception exc) {
-							/*
-							 * do nothing
-							 */
-						}
-
-						/*
-						 * Show the popup
-						 */
-						popup.setVisible(true);
-
-						if (popup.getButtonClicked() == ButtonClicked.OK) {
-							for (String cat : popup.getSelCateList()) {
-								if (!strengthList.contains(cat)) {
-									strengthList.add(cat);
-								}
-							}
-
-							stm.fireTableDataChanged();
-
-							updateStrengthButtons();
-						}
-
-						return null;
-					}
-				};
-
-				showPopupWorker.execute();
-			}
-		});
-
-		buttonPanel.add(addStrength);
-
-		removeStrength = GUITools.newImageButton();
-		removeStrength
-				.setIcon(Data.getInstance().getIcon("remove_25x25_0.png"));
-		removeStrength.setRolloverIcon(Data.getInstance().getIcon(
-				"remove_25x25.png"));
-		removeStrength.setToolTipText(Data.getInstance().getLocaleStr(
-				"attendeeDialog.remStrength"));
-		removeStrength.addActionListener(new ActionListener() {
-			@Override
-			public void actionPerformed(ActionEvent ev) {
-				int selRow = strengthTbl.getSelectedRow();
-
-				String str = (String) stm.getValueAt(selRow, 1);
-
-				strengthList.remove(str);
-
-				stm.fireTableDataChanged();
-
-				updateStrengthButtons();
-			}
-		});
-
-		buttonPanel.add(removeStrength);
-
-		JScrollPane strScrllPn = GUITools.setIntoScrollPane(strengthTbl);
-
-		GUITools.addComponent(basePanel, gbl, nameLabel, 0, 0, 1, 1, 0, 0, 0,
-				20, 0, 20, GridBagConstraints.NONE,
-				GridBagConstraints.NORTHWEST);
-		GUITools.addComponent(basePanel, gbl, nameTxtFld, 1, 0, 3, 1, 1.0, 0,
-				0, 20, 0, 0, GridBagConstraints.HORIZONTAL,
-				GridBagConstraints.NORTHWEST);
-		GUITools.addComponent(basePanel, gbl, directoryBttn, 4, 0, 1, 1, 0, 0,
-				0, 5, 0, 20, GridBagConstraints.NONE,
-				GridBagConstraints.NORTHWEST);
-		GUITools.addComponent(basePanel, gbl, contactLabel, 0, 1, 1, 1, 0, 0,
-				5, 20, 0, 20, GridBagConstraints.NONE,
-				GridBagConstraints.NORTHWEST);
-		GUITools.addComponent(basePanel, gbl, contactScrllPn, 1, 1, 3, 3, 1.0,
-				0.5, 5, 20, 0, 0, GridBagConstraints.BOTH,
-				GridBagConstraints.NORTHWEST);
-		GUITools.addComponent(basePanel, gbl, roleLabel, 0, 4, 1, 1, 0, 0, 10,
-				20, 0, 20, GridBagConstraints.NONE,
-				GridBagConstraints.NORTHWEST);
-		GUITools.addComponent(basePanel, gbl, roleCmbBx, 1, 4, 3, 1, 1.0, 0,
-				10, 20, 0, 0, GridBagConstraints.HORIZONTAL,
-				GridBagConstraints.NORTHWEST);
-		GUITools.addComponent(basePanel, gbl, strengthLabel, 0, 5, 1, 1, 0, 0,
-				17, 20, 0, 20, GridBagConstraints.NONE,
-				GridBagConstraints.NORTHWEST);
-		GUITools.addComponent(basePanel, gbl, strScrllPn, 1, 5, 3, 2, 1.0, 0.5,
-				15, 20, 0, 0, GridBagConstraints.BOTH,
-				GridBagConstraints.NORTHWEST);
-		GUITools.addComponent(basePanel, gbl, buttonPanel, 4, 5, 1, 2, 0, 0,
-				17, 5, 0, 0, GridBagConstraints.NONE,
-				GridBagConstraints.NORTHWEST);
-
-		setCurrentAttendee(null);
-
-		basePanel.repaint();
-
-		pack();
-	}
-
-	/**
-	 * Instantiates a new assistant dialog.
-	 * 
-	 * @param parent
-	 *            the parent
-	 */
-	public AssistantDialog(Frame parent) {
-		super(parent);
-
-		dialogLevel = Level.LEVEL1;
-		setTitle(Data.getInstance().getLocaleStr("assistantDialog.title"));
-		setIcon(Data.getInstance().getIcon("assistantDialog_64x64.png"));
-
-		addButton(buttonExit);
-		addButton(buttonBack);
-		addButton(buttonConfirm);
-
-		getContentPane().setLayout(new BorderLayout());
-		add(basePanel, BorderLayout.CENTER);
-
-		pathTxtFld.setColumns(13);
-		pathTxtFld.setText("");
-		pathTxtFld.setBorder(BorderFactory.createLineBorder(Color.GRAY));
-		pathTxtFld.addKeyListener(new KeyListener() {
-			@Override
-			public void keyPressed(KeyEvent arg0) {
-			}
-
-			@Override
-			public void keyReleased(KeyEvent e) {
-				listLastRevs.setListData(getLastReviews());
-			}
-
-			@Override
-			public void keyTyped(KeyEvent e) {
-			}
-		});
-
-		MatteBorder padding = new MatteBorder(0, 10, 0, 0, getContentPane()
-				.getBackground());
-		buttonBrowse.setBorder(padding);
-
-		buttonExit.setIcon(Data.getInstance().getIcon("buttonExit_16x16.png"));
-		buttonBack.setIcon(Data.getInstance().getIcon("buttonBack_16x16.png"));
-		buttonConfirm.setIcon(Data.getInstance().getIcon("buttonOk_16x16.png"));
-
-		buttonBrowse.setToolTipText(Data.getInstance().getLocaleStr(
-				"assistantDialog.browseToolTip"));
-		buttonBrowse.addActionListener(new ActionListener() {
-			@Override
-			public void actionPerformed(ActionEvent e) {
-				FileChooser fileChooser = UI.getInstance().getFileChooser();
-
-				if (fileChooser.showDialog(UI.getInstance()
-						.getAssistantDialog(), FileChooser.MODE_OPEN_FILE,
-						ResiFileFilter.TYPE_REVIEW) == FileChooser.SELECTED_APPROVE) {
-					String reviewPath = fileChooser.getFile().getAbsolutePath();
-
-					UI.getInstance().getAssistantDialog().setPath(reviewPath);
-
-					listLastRevs.setListData(getLastReviews());
-				}
-			}
-		});
-
-		buttonBack.addActionListener(new ActionListener() {
-			@Override
-			public void actionPerformed(ActionEvent arg0) {
-				if (dialogLevel == Level.LEVEL2) {
-					UI.getInstance().getAssistantDialog().setSelectMode();
-					dialogLevel = Level.LEVEL1;
-				} else if (dialogLevel == Level.LEVEL3) {
-					UI.getInstance().getAssistantDialog().setSelectReview();
-					dialogLevel = Level.LEVEL2;
-				}
-			}
-		});
-
-		buttonConfirm.addActionListener(new ActionListener() {
-			@Override
-			public void actionPerformed(ActionEvent e) {
-				// No review path
-				if (UI.getInstance().getAssistantDialog().getSelected() == AssistantDialog.Selection.LOAD_REVIEW
-						&& UI.getInstance().getAssistantDialog().getPath()
-								.equals("")) {
-					JOptionPane.showMessageDialog(UI.getInstance()
-							.getAssistantDialog(), GUITools.getMessagePane(Data
-							.getInstance().getLocaleStr(
-									"message.selectReviewToLoad")), Data
-							.getInstance().getLocaleStr("error"),
-							JOptionPane.ERROR_MESSAGE);
-
-					return;
-				}
-
-				// Set AddAttendee screen
-				if (UI.getInstance().getAssistantDialog().getSelected() == AssistantDialog.Selection.NEW_REVIEW
-						&& Data.getInstance().getMode().equals("instant")
-						&& dialogLevel == Level.LEVEL2) {
-					setAddAttToInstRev();
-
-					dialogLevel = Level.LEVEL3;
-
-					return;
-				}
-
-				// Do some checks and updates on level 3
-				if (dialogLevel == Level.LEVEL3) {
-					
-
-					if (!nameTxtFld.getText().trim().equals("")) {
-						ActionRegistry.getInstance().get(
-								InitializeMainFrameAction.class.getName())
-								.actionPerformed(e);
-						updateInstantAtt();
-					}else{
-						String message="";
-						message = Data.getInstance().getLocaleStr(
-						"attendeeDialog.message.noName");
-
-						setMessage(message);
-						nameTxtFld.setBorder(UI.MARKED_BORDER_INLINE);
-					}
-
-					return;
-				}
-
-				ActionRegistry.getInstance().get(
-						InitializeMainFrameAction.class.getName())
-						.actionPerformed(e);
-			}
-		});
-
-		setDefaultCloseOperation(JDialog.DO_NOTHING_ON_CLOSE);
-
-		setSelectMode();
-
-		setMinimumSize(new Dimension(550, 500));
-
-		pack();
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.revager.gui.AbstractDialog#setVisible(boolean)
-	 */
-	@Override
-	public void setVisible(boolean vis) {
-		if (vis) {
-			setLocationToCenter();
-
-		}
-
-		super.setVisible(vis);
-	}
-
-	/**
-	 * Gets the last reviews.
-	 * 
-	 * @return the last reviews
-	 */
-	private Vector<String> getLastReviews() {
-		Vector<String> vecLastReviews = new Vector<String>();
-
-		try {
-			for (String rev : Data.getInstance().getAppData().getLastReviews()) {
-				vecLastReviews.add(new File(rev).getName());
-			}
-		} catch (DataException exc) {
-			JOptionPane.showMessageDialog(null, GUITools.getMessagePane(exc
-					.getMessage()), Data.getInstance().getLocaleStr("error"),
-					JOptionPane.ERROR_MESSAGE);
-		}
-
-		return vecLastReviews;
-	}
-
-	private FocusListener focusListener = new FocusListener() {
-		@Override
-		public void focusGained(FocusEvent e) {
-			if (e.getSource() != strengthTbl) {
-				if (strengthTbl.getRowCount() > 0) {
-					strengthTbl.removeRowSelectionInterval(0, strengthTbl
-							.getRowCount() - 1);
-
-					updateStrengthButtons();
-				}
-			}
-		}
-
-		@Override
-		public void focusLost(FocusEvent e) {
-		}
-	};
-
-	/**
-	 * Update strength buttons.
-	 */
-	private void updateStrengthButtons() {
-		if (strengthTbl.getSelectedRow() != -1 && strengthTbl.isEnabled()) {
-			removeStrength.setEnabled(true);
-		} else {
-			removeStrength.setEnabled(false);
-		}
-	}
-
-	/**
-	 * Sets the current app attendee.
-	 * 
-	 * @param appAtt
-	 *            the new current app attendee
-	 */
-	public void setCurrentAppAttendee(AppAttendee appAtt) {
-		this.currentAppAttendee = appAtt;
-
-		nameTxtFld.setBorder(UI.STANDARD_BORDER_INLINE);
-		contactScrllPn.setBorder(UI.STANDARD_BORDER);
-
-		nameTxtFld.setText(currentAppAttendee.getName());
-
-		try {
-			contactTxtArea.setText(currentAppAttendee.getContact());
-		} catch (DataException e) {
-			JOptionPane.showMessageDialog(this, GUITools.getMessagePane(e
-					.getMessage()), Data.getInstance().getLocaleStr("error"),
-					JOptionPane.ERROR_MESSAGE);
-		}
-
-		updateStrengthTable();
-	}
-
-	/**
-	 * Sets the current attendee.
-	 * 
-	 * @param att
-	 *            the new current attendee
-	 */
-	public void setCurrentAttendee(Attendee att) {
-		//currentAttendee = att;
-		currentAppAttendee = null;
-
-		nameTxtFld.setText(null);
-		contactTxtArea.setText(null);
-		roleCmbBx.setSelectedItem(Data.getInstance().getLocaleStr(
-				"role." + Role.REVIEWER.toString().toLowerCase()));
-
-		updateStrengthTable();
-	}
-
-	/**
-	 * Update strength table.
-	 */
-	private void updateStrengthTable() {
-
-		try {
-			strengthList = currentAppAttendee.getStrengths();
-		} catch (Exception e) {
-			strengthList = new ArrayList<String>();
-		}
-
-		if (stm == null) {
-			stm = new StrengthTableModel();
-			strengthTbl.setModel(stm);
-		}
-
-		stm.fireTableDataChanged();
-
-		/*
-		 * View of strengths
-		 */
-		boolean enable = false;
-
-		if (((String) roleCmbBx.getSelectedItem()).equals(Data.getInstance()
-				.getLocaleStr("role.reviewer"))) {
-			enable = true;
-		}
-
-		addStrength.setEnabled(enable);
-		removeStrength.setEnabled(false);
-		strengthTbl.setEnabled(enable);
-		strengthLabel.setEnabled(enable);
-
-		if (enable) {
-			strengthTbl.setForeground(Color.BLACK);
-		} else {
-			strengthTbl.setForeground(Color.GRAY);
-		}
-	}
-
-	/**
-	 * Gets the strength list.
-	 * 
-	 * @return the strengthList
-	 */
-	public List<String> getStrengthList() {
-		if (strengthList == null) {
-			strengthList = new ArrayList<String>();
-		}
-
-		return strengthList;
-	}
-
-	/**
-	 * Adds instant reviewer
-	 * 
-	 */
-	public void updateInstantAtt() {
-
-		Role[] roles = Role.values();
-		String attContact;
-
-		nameTxtFld.setBorder(UI.STANDARD_BORDER_INLINE);
-		contactScrllPn.setBorder(UI.STANDARD_BORDER);
-
-		String attName = nameTxtFld.getText();
-		if (contactTxtArea.getText() != null)
-			attContact = contactTxtArea.getText();
-		else
-			attContact = "";
-
-		Role attRole = roles[roleCmbBx.getSelectedIndex()];
-
-		nameMissing = false;
-
-
-
-			/*
-			 * Update the app attendee in the database
-			 */
-			try {
-				if (currentAppAttendee == null) {
-					currentAppAttendee = Data.getInstance().getAppData()
-							.getAttendee(attName, attContact);
-
-					if (currentAppAttendee == null) {
-						currentAppAttendee = Data.getInstance().getAppData()
-								.newAttendee(attName, attContact);
-					}
-				} else {
-					currentAppAttendee.setNameAndContact(attName, attContact);
-				}
-
-				for (String str : currentAppAttendee.getStrengths()) {
-					currentAppAttendee.removeStrength(str);
-				}
-
-				for (String str : strengthList) {
-					currentAppAttendee.addStrength(str);
-				}
-			} catch (DataException e1) {
-				JOptionPane.showMessageDialog(UI.getInstance()
-						.getAssistantDialog(), GUITools.getMessagePane(e1
-						.getMessage()), Data.getInstance()
-						.getLocaleStr("error"), JOptionPane.ERROR_MESSAGE);
-			}
-
-			/*
-			 * update the review attendee
-			 */
-			Attendee newAtt = new Attendee();
-
-			newAtt.setName(attName);
-			newAtt.setContact(attContact);
-			newAtt.setRole(attRole);
-
-			Application.getInstance().getAttendeeMgmt().addAttendee(attName,
-					attContact, attRole, null);
-
-			setVisible(false);
-
-			UI.getInstance().getAspectsManagerFrame().updateViews();
-		
-
-	}
-
-	/**
-	 * Gets the dialog level
-	 * 
-	 * @return dialogLevel
-	 */
-	public Level getLevel() {
-
-		return dialogLevel;
-	}
-
-}
 
=== modified file 'src/org/revager/gui/dialogs/EditProductDialog.java'
--- src/org/revager/gui/dialogs/EditProductDialog.java	2010-01-31 17:32:35 +0000
+++ src/org/revager/gui/dialogs/EditProductDialog.java	2010-05-26 20:44:25 +0000
@@ -55,7 +55,6 @@
 import org.revager.gui.models.ReferenceTableModel;
 import org.revager.tools.GUITools;
 
-
 /**
  * The Class EditProductDialog.
  */
 
=== modified file 'src/org/revager/gui/dialogs/SettingsDialog.java'
--- src/org/revager/gui/dialogs/SettingsDialog.java	2010-01-31 17:32:35 +0000
+++ src/org/revager/gui/dialogs/SettingsDialog.java	2010-05-26 20:44:25 +0000
@@ -63,7 +63,6 @@
 import org.revager.tools.FileTools;
 import org.revager.tools.GUITools;
 
-
 /**
  * The Class SettingsDialog.
  */
@@ -314,8 +313,8 @@
 				if (currentLang.equals(selectedLang)) {
 					setMessage(null);
 				} else {
-					setMessage(Data.getInstance()
-				.getLocaleStr("settingsDialog.general.langHintRestart"));
+					setMessage(Data.getInstance().getLocaleStr(
+							"settingsDialog.general.langHintRestart"));
 				}
 			}
 		});
 
=== added directory 'src/org/revager/gui/dialogs/assistant'
=== added file 'src/org/revager/gui/dialogs/assistant/AssistantDialog.java'
--- src/org/revager/gui/dialogs/assistant/AssistantDialog.java	1970-01-01 00:00:00 +0000
+++ src/org/revager/gui/dialogs/assistant/AssistantDialog.java	2010-05-26 20:44:25 +0000
@@ -0,0 +1,283 @@
+/* 
+ * Copyright 2009 Davide Casciato, Sandra Reich, Johannes Wettinger
+ * 
+ * This file is part of Resi.
+ *
+ * Resi is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Resi is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Resi. If not, see <http://www.gnu.org/licenses/>.
+ */
+package org.revager.gui.dialogs.assistant;
+
+import java.awt.BorderLayout;
+import java.awt.Container;
+import java.awt.Dimension;
+import java.awt.Frame;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+
+import javax.swing.ImageIcon;
+import javax.swing.JButton;
+import javax.swing.JDialog;
+
+import org.revager.app.model.Data;
+import org.revager.gui.AbstractDialog;
+import org.revager.gui.UI;
+import org.revager.gui.actions.ActionRegistry;
+import org.revager.gui.actions.InitializeNewReviewAction;
+import org.revager.gui.actions.assistant.GoToFirstScreenPnlAction;
+
+/**
+ * The class AssistantDialog.
+ * 
+ * @author D.Casciato
+ * 
+ */
+@SuppressWarnings("serial")
+public class AssistantDialog extends AbstractDialog {
+
+	private Container currentPnl;
+	private FirstScreenPanel firstScreenPanel = new FirstScreenPanel(this);
+	private OpenReviewPanel openReviewPanel = new OpenReviewPanel(this);
+	private Container addAttendeePanel = UI.getInstance().getAttendeeDialog()
+			.getContentPane();
+
+	private ImageIcon revagerIcon = Data.getInstance().getIcon(
+			"revager_50x50.png");
+
+	/**
+	 * Action to shut down the application.
+	 */
+	private ActionListener exitApp = new ActionListener() {
+
+		@Override
+		public void actionPerformed(ActionEvent e) {
+			System.exit(0);
+		}
+
+	};
+
+	/**
+	 * Action to initialize a new review.
+	 */
+	private ActionListener initQuickRev = ActionRegistry.getInstance().get(
+			InitializeNewReviewAction.class.getName());
+
+	/*
+	 * Strings
+	 */
+	private String firstScreenDescStrng = Data.getInstance().getLocaleStr(
+			"assistantDialog.firstDesc");
+
+	private String openRevDescStrng = Data.getInstance().getLocaleStr(
+			"assistantDialog.openDesc");
+
+	private String addAttDescStrng = Data.getInstance().getLocaleStr(
+			"addYourself.description");
+	private String localMode = "moderator";
+
+	/*
+	 * 
+	 * Wizard buttons
+	 */
+	private JButton backBttn = new JButton();
+	private JButton finishBttn = new JButton();
+	private ImageIcon confirmIcon = Data.getInstance().getIcon(
+			"buttonOk_16x16.png");
+	private String confirmString = Data.getInstance().getLocaleStr("confirm");
+
+	/**
+	 * Sets the localMode parameter
+	 * 
+	 * @param string
+	 */
+	public void setLocalMode(String string) {
+		this.localMode = string;
+
+	}
+
+	/**
+	 * Returns the currentPanel.
+	 * 
+	 * @return
+	 */
+	public Container getCurrentPnl() {
+		return currentPnl;
+	}
+
+	/**
+	 * Sets the currentPanel.
+	 * 
+	 * @param currentPnl
+	 */
+	public void setCurrentPnl(Container currentPnl) {
+
+		this.currentPnl = currentPnl;
+
+	}
+
+	/**
+	 * Returns the FirstScreenPanel.
+	 * 
+	 * @return
+	 */
+	public FirstScreenPanel getFirstScreenPanel() {
+		return firstScreenPanel;
+	}
+
+	/**
+	 * Returns the OpenReviewPanel.
+	 * 
+	 * @return
+	 */
+	public OpenReviewPanel getOpenReviewPanel() {
+		return openReviewPanel;
+	}
+
+	/**
+	 * Returns the AddAttendeePanel.
+	 * 
+	 * @return
+	 */
+	public Container getAddAttendeePanel() {
+		return addAttendeePanel;
+	}
+
+	/**
+	 * Returns the BackButton.
+	 * 
+	 * @return
+	 */
+	public JButton getBackBttn() {
+		return backBttn;
+	}
+
+	/**
+	 * constructor
+	 * 
+	 * @param parent
+	 */
+	public AssistantDialog(Frame parent) {
+		super(parent);
+
+		defineWizardBttns();
+		Data.getInstance().setMode("moderator");
+		setIcon(revagerIcon);
+		setCurrentPnl(firstScreenPanel);
+		getContentPane().setLayout(new BorderLayout());
+		backBttn.addActionListener(ActionRegistry.getInstance().get(
+				GoToFirstScreenPnlAction.class.getName()));
+
+		updateContents();
+
+		setDefaultCloseOperation(JDialog.DO_NOTHING_ON_CLOSE);
+
+		setMinimumSize(new Dimension(650, 500));
+
+		pack();
+	}
+
+	/**
+	 * Defines the wizard buttons ; should be invoked in the constructor once.
+	 */
+	private void defineWizardBttns() {
+
+		backBttn.setText(Data.getInstance().getLocaleStr("back"));
+		backBttn.setIcon(Data.getInstance().getIcon("buttonBack_16x16.png"));
+
+		finishBttn.setText(confirmString);
+		finishBttn.setIcon(confirmIcon);
+
+		this.addButton(backBttn);
+		this.addButton(finishBttn);
+
+		backBttn.setEnabled(false);
+		finishBttn.setEnabled(false);
+	}
+
+	/**
+	 * Updates the wizard buttons and should be invoked after the content has
+	 * changed.
+	 */
+	public void updateWizardBttns() {
+		finishBttn.removeActionListener(exitApp);
+		finishBttn.removeActionListener(openReviewPanel.openExistRev);
+		finishBttn.removeActionListener(initQuickRev);
+
+		if (currentPnl == firstScreenPanel) {
+
+			backBttn.setEnabled(false);
+			finishBttn.setEnabled(false);
+
+		} else if (currentPnl == addAttendeePanel) {
+
+			backBttn.setEnabled(true);
+			finishBttn.setEnabled(true);
+			finishBttn.addActionListener(initQuickRev);
+
+		} else if (currentPnl == openReviewPanel) {
+
+			backBttn.setEnabled(true);
+			finishBttn.setEnabled(true);
+			finishBttn.addActionListener(openReviewPanel.openExistRev);
+			if (openReviewPanel.getLastRevsVector().size() == 0)
+				finishBttn.setEnabled(false);
+
+		}
+	}
+
+	/**
+	 * Updates the content area.
+	 */
+	public void updateContents() {
+
+		this.getContentPane().removeAll();
+
+		updateMessage();
+
+		if (currentPnl == firstScreenPanel) {
+			this.getContentPane().add(firstScreenPanel, BorderLayout.CENTER);
+			Data.getInstance().setMode("moderator");
+		} else if (currentPnl == addAttendeePanel) {
+			this.getContentPane().add(addAttendeePanel, BorderLayout.CENTER);
+			Data.getInstance().setMode("instant");
+
+			UI.getInstance().getAttendeeDialog().setCurrentAttendee(null);
+			UI.getInstance().getAttendeeDialog().getNameTxtFld().setText(
+					System.getProperty("user.name"));
+		} else if (currentPnl == openReviewPanel) {
+			this.getContentPane().add(openReviewPanel, BorderLayout.CENTER);
+			Data.getInstance().setMode(localMode);
+		}
+
+		this.getContentPane().validate();
+		this.getContentPane().repaint();
+
+	}
+
+	/**
+	 * Updates the description of the assistant, depending from the
+	 * currentPanel.
+	 */
+	public void updateMessage() {
+
+		if (currentPnl == firstScreenPanel) {
+			setDescription(firstScreenDescStrng);
+		} else if (currentPnl == addAttendeePanel) {
+			setDescription(addAttDescStrng);
+		} else if (currentPnl == openReviewPanel) {
+			setDescription(openRevDescStrng);
+		}
+
+	}
+
+}
 
=== added file 'src/org/revager/gui/dialogs/assistant/FirstScreenPanel.java'
--- src/org/revager/gui/dialogs/assistant/FirstScreenPanel.java	1970-01-01 00:00:00 +0000
+++ src/org/revager/gui/dialogs/assistant/FirstScreenPanel.java	2010-05-26 20:44:25 +0000
@@ -0,0 +1,193 @@
+/* 
+ * Copyright 2009 Davide Casciato, Sandra Reich, Johannes Wettinger
+ * 
+ * This file is part of Resi.
+ *
+ * Resi is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Resi is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Resi. If not, see <http://www.gnu.org/licenses/>.
+ */
+package org.revager.gui.dialogs.assistant;
+
+import java.awt.GridBagConstraints;
+import java.awt.GridBagLayout;
+import java.awt.event.ActionListener;
+
+import javax.swing.ImageIcon;
+import javax.swing.JSeparator;
+import javax.swing.SwingConstants;
+
+import org.revager.app.model.Data;
+import org.revager.gui.AbstractDialog;
+import org.revager.gui.AbstractDialogPanel;
+import org.revager.gui.actions.ActionRegistry;
+import org.revager.gui.actions.InitializeNewReviewAction;
+import org.revager.gui.actions.OpenAspectsManagerAction;
+import org.revager.gui.actions.assistant.GoToAddAttPnlAction;
+import org.revager.gui.actions.assistant.GoToOpenRevPnlAction;
+import org.revager.gui.actions.assistant.SelectLanguageAction;
+import org.revager.gui.helpers.HLink;
+import org.revager.gui.helpers.VLink;
+import org.revager.tools.GUITools;
+
+/**
+ * The class FirstScreenPanel.
+ * 
+ * @author D.Casciato
+ *
+ */
+
+@SuppressWarnings("serial")
+public class FirstScreenPanel extends AbstractDialogPanel {
+
+	private JSeparator dottedSprtr = new JSeparator(SwingConstants.HORIZONTAL);
+
+	private GridBagLayout gbl1 = new GridBagLayout();
+
+
+	/**
+	 * Action to select a language.
+	 */
+	private ActionListener selectLanguageAction = ActionRegistry.getInstance()
+			.get(SelectLanguageAction.class.getName());
+	/**
+	 * Action to open up the Aspects-Manager.
+	 */
+	private ActionListener openAspMngrAction = ActionRegistry.getInstance()
+			.get(OpenAspectsManagerAction.class.getName());
+
+	/*
+	 * Strings
+	 */
+	private String quickRevTooltipStrng = Data.getInstance().getLocaleStr(
+			"assistantDialog.quickRev.rollover");
+	private String newRevTooltipStrng = Data.getInstance().getLocaleStr(
+			"assistantDialog.newRev.rollover");
+	private String openRevTooltipStrng = Data.getInstance().getLocaleStr(
+			"assistantDialog.openRev.rollover");
+	private String selectLanguageTooltipStrng = Data.getInstance()
+			.getLocaleStr("assistantDialog.selectLanguage.rollover");
+	private String openAspectsMngrTooltipStrng = Data.getInstance()
+			.getLocaleStr("assistantDialog.openAspectsMngr.rollover");
+
+	private String openRevStrng = Data.getInstance().getLocaleStr(
+			"assistantDialog.openReview");
+
+	private String languageStrng = Data.getInstance().getLocaleStr(
+			"assistantDialog.selectLanguage");
+	private String aspectsManagerStrng = Data.getInstance().getLocaleStr(
+			"assistantDialog.aspectsManager");
+	private String newReviewStrng = Data.getInstance().getLocaleStr(
+			"assistantDialog.newReview");
+	private String quickstartStrng = Data.getInstance().getLocaleStr(
+			"assistantDialog.quickstart");
+
+	/*
+	 *ImageIcons 
+	 */
+	private ImageIcon moderatorIcon = Data.getInstance().getIcon(
+			"moderator_128x128_0.png");
+	private ImageIcon moderatorRolloverIcon = Data.getInstance().getIcon(
+			"moderator_128x128.png");
+	private ImageIcon openRevIcon = Data.getInstance().getIcon(
+			"scribe_128x128_0.png");
+	private ImageIcon openRevRolloverIcon = Data.getInstance().getIcon(
+			"scribe_128x128.png");
+	private ImageIcon quickstartIcon = Data.getInstance().getIcon(
+			"instantReview_128x128_0.png");
+	private ImageIcon quickstartRolloverIcon = Data.getInstance().getIcon(
+			"instantReview_128x128.png");
+	private ImageIcon languageIcon = Data.getInstance().getIcon(
+			"language_31x20_0.png");
+	private ImageIcon languageRolloverIcon = Data.getInstance().getIcon(
+			"language_31x20.png");
+	private ImageIcon aspectsManagerIcon = Data.getInstance().getIcon(
+			"aspectsManager_25x25_0.png");
+	private ImageIcon aspectsManagerRolloverIcon = Data.getInstance().getIcon(
+			"aspectsManager_25x25.png");
+
+	/*
+	 * Links
+	 */
+	private VLink newReviewLnk = new VLink(newReviewStrng, moderatorIcon,
+			moderatorRolloverIcon);
+	private VLink quickstartLnk = new VLink(quickstartStrng, quickstartIcon,
+			quickstartRolloverIcon);
+	private VLink openReviewLnk = new VLink(openRevStrng, openRevIcon,
+			openRevRolloverIcon);
+	private HLink selectLanguageLnk = new HLink(languageStrng, languageIcon,
+			languageRolloverIcon, null);
+	private HLink openAspManagerLnk = new HLink(aspectsManagerStrng,
+			aspectsManagerIcon, aspectsManagerRolloverIcon, null);
+
+	/**
+	 * Constructor
+	 * 
+	 * @param parent
+	 */
+	public FirstScreenPanel(AbstractDialog parent) {
+		super(parent);
+		createFirstScreenPnl();
+	} 
+	
+	/**
+	 * Method which creates and locates the components of the panel.
+	 */
+	private void createFirstScreenPnl() {
+
+		quickstartLnk.setFather(this);
+		newReviewLnk.setFather(this);
+		openReviewLnk.setFather(this);
+		selectLanguageLnk.setFather(this);
+		openAspManagerLnk.setFather(this);
+
+		newReviewLnk.addActionListener(ActionRegistry.getInstance().get(
+				InitializeNewReviewAction.class.getName()));
+
+		openReviewLnk.addActionListener(ActionRegistry.getInstance().get(GoToOpenRevPnlAction.class.getName()));
+		quickstartLnk.addActionListener(ActionRegistry.getInstance().get(GoToAddAttPnlAction.class.getName()));
+		selectLanguageLnk.addActionListener(selectLanguageAction);
+		openAspManagerLnk.addActionListener(openAspMngrAction);
+
+		selectLanguageLnk.setUnderlined(true);
+		openAspManagerLnk.setUnderlined(true);
+
+		quickstartLnk.addRolloverText(quickRevTooltipStrng);
+
+		openReviewLnk.addRolloverText(openRevTooltipStrng);
+		newReviewLnk.addRolloverText(newRevTooltipStrng);
+		selectLanguageLnk.addRolloverText(selectLanguageTooltipStrng);
+		openAspManagerLnk.addRolloverText(openAspectsMngrTooltipStrng);
+
+		this.setLayout(gbl1);
+		GUITools.addComponent(this, gbl1, newReviewLnk, 0, 0, 1, 1,
+				1.0, 1.0, 0, 20, 0, 20, GridBagConstraints.BOTH,
+				GridBagConstraints.NORTHWEST);
+		GUITools.addComponent(this, gbl1, quickstartLnk, 1, 0, 1,
+				1, 1.0, 1.0, 0, 20, 0, 20, GridBagConstraints.BOTH,
+				GridBagConstraints.NORTHWEST);
+		GUITools.addComponent(this, gbl1, openReviewLnk, 2, 0, 1,
+				1, 1.0, 1.0, 0, 20, 0, 20, GridBagConstraints.BOTH,
+				GridBagConstraints.NORTHWEST);
+		GUITools.addComponent(this, gbl1, dottedSprtr, 0, 1, 3, 1,
+				1.0, 0.0, 20, 20, 0, 0, GridBagConstraints.HORIZONTAL,
+				GridBagConstraints.CENTER);
+		GUITools.addComponent(this, gbl1, selectLanguageLnk, 0, 2,
+				1, 1, 1.0, 0.0, 20, 20, 0, 0, GridBagConstraints.HORIZONTAL,
+				GridBagConstraints.CENTER);
+		GUITools.addComponent(this, gbl1, openAspManagerLnk, 2, 2,
+				1, 1, 1.0, 0.0, 20, 0, 0, 0, GridBagConstraints.HORIZONTAL,
+				GridBagConstraints.CENTER);
+
+	}
+
+}
 
=== added file 'src/org/revager/gui/dialogs/assistant/LanguagePopupWindow.java'
--- src/org/revager/gui/dialogs/assistant/LanguagePopupWindow.java	1970-01-01 00:00:00 +0000
+++ src/org/revager/gui/dialogs/assistant/LanguagePopupWindow.java	2010-05-26 20:44:25 +0000
@@ -0,0 +1,227 @@
+/* 
+ * Copyright 2009 Davide Casciato, Sandra Reich, Johannes Wettinger
+ * 
+ * This file is part of Resi.
+ *
+ * Resi is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Resi is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Resi. If not, see <http://www.gnu.org/licenses/>.
+ */
+package org.revager.gui.dialogs.assistant;
+
+import java.awt.BorderLayout;
+import java.awt.Dimension;
+import java.awt.GridBagConstraints;
+import java.awt.GridBagLayout;
+import java.awt.Window;
+
+import javax.swing.BorderFactory;
+import javax.swing.ImageIcon;
+import javax.swing.JButton;
+import javax.swing.JDialog;
+import javax.swing.JPanel;
+import javax.swing.JTextArea;
+
+import org.revager.app.model.ApplicationData;
+import org.revager.app.model.Data;
+import org.revager.app.model.DataException;
+import org.revager.app.model.appdata.AppSettingKey;
+import org.revager.gui.UI;
+import org.revager.gui.actions.popup.LanguagePopupWindowAction;
+import org.revager.gui.helpers.HLink;
+import org.revager.gui.helpers.LinkGroup;
+import org.revager.tools.GUITools;
+
+/**
+ * The Class LanguagePopupWindow.
+ * 
+ * @author D.Casciato
+ * 
+ */
+@SuppressWarnings("serial")
+public class LanguagePopupWindow extends JDialog {
+
+	/**
+	 * The Enum ButtonClicked.
+	 */
+	public static enum ButtonClicked {
+		OK, ABORT;
+	};
+
+	private ApplicationData appData = Data.getInstance().getAppData();
+
+	private ButtonClicked buttonClicked = null;
+
+	private GridBagLayout gbl = new GridBagLayout();
+	/*
+	 * Panels
+	 */
+	private JPanel inputPnl = new JPanel(gbl);
+	private JPanel panelBase = GUITools.newPopupBasePanel();
+
+	/*
+	 * Strings
+	 */
+	private String germanStrng = Data.getInstance().getLocaleStr(
+			"popup.language.german");
+	private String englishStrng = Data.getInstance().getLocaleStr(
+			"popup.language.english");
+
+	/*
+	 * ImageIcons
+	 */
+	private ImageIcon germanIcon = Data.getInstance().getIcon(
+			"german_31x20_0.png");
+	private ImageIcon germanRolloverIcon = Data.getInstance().getIcon(
+			"german_31x20.png");
+	private ImageIcon englishIcon = Data.getInstance().getIcon(
+			"english_31x20_0.png");
+	private ImageIcon englishRolloverIcon = Data.getInstance().getIcon(
+			"english_31x20.png");
+	private String currentLang;
+
+	/*
+	 * Links and LinkGroup
+	 */
+	private LinkGroup languageGrp = new LinkGroup();
+	private HLink germanHLnk = new HLink(germanStrng, germanIcon,
+			germanRolloverIcon, languageGrp);
+	private HLink englishHLnk = new HLink(englishStrng, englishIcon,
+			englishRolloverIcon, languageGrp);
+
+	/**
+	 * Returns the selected language.
+	 * 
+	 * @return
+	 */
+	public String getSelectedLanguage() {
+		if (languageGrp.getSelectedLinkText().contains(
+				Data.getInstance().getLocaleStr("popup.language.german")))
+			return "de";
+		else
+			return "en";
+	}
+
+	/**
+	 * Constructor
+	 * 
+	 * @param parent
+	 * @param titleText
+	 */
+	public LanguagePopupWindow(Window parent, String titleText) {
+		super(parent);
+
+		setLayout(new BorderLayout());
+
+		setUndecorated(true);
+
+		setModal(true);
+
+		JTextArea textTitle = GUITools.newPopupTitleArea(titleText);
+
+		panelBase.add(textTitle, BorderLayout.NORTH);
+
+		try {
+			currentLang = appData.getSetting(AppSettingKey.APP_LANGUAGE);
+		} catch (DataException e) {
+			currentLang = null;
+		}
+		languageGrp.addLink(germanHLnk);
+		languageGrp.addLink(englishHLnk);
+
+		if (currentLang.equals("de"))
+			languageGrp.selectLink(germanHLnk);
+		else if (currentLang.equals("en"))
+			languageGrp.selectLink(englishHLnk);
+
+		GUITools.addComponent(inputPnl, gbl, germanHLnk, 0, 0, 1, 1, 1.0, 1.0,
+				10, 10, 0, 10, GridBagConstraints.BOTH,
+				GridBagConstraints.CENTER);
+		GUITools.addComponent(inputPnl, gbl, englishHLnk, 0, 1, 1, 1, 1.0, 1.0,
+				10, 10, 10, 10, GridBagConstraints.BOTH,
+				GridBagConstraints.CENTER);
+
+		panelBase.add(inputPnl, BorderLayout.CENTER);
+
+		/*
+		 * The buttons to abort and confirm the input
+		 */
+		JButton buttonAbort = GUITools.newImageButton();
+		buttonAbort.setIcon(Data.getInstance().getIcon(
+				"buttonCancel_24x24_0.png"));
+		buttonAbort.setRolloverIcon(Data.getInstance().getIcon(
+				"buttonCancel_24x24.png"));
+		buttonAbort.setToolTipText(Data.getInstance().getLocaleStr("abort"));
+		buttonAbort.addActionListener(new LanguagePopupWindowAction(this,
+				ButtonClicked.ABORT));
+
+		JButton buttonConfirm = GUITools.newImageButton();
+		buttonConfirm.setIcon(Data.getInstance()
+				.getIcon("buttonOk_24x24_0.png"));
+		buttonConfirm.setRolloverIcon(Data.getInstance().getIcon(
+				"buttonOk_24x24.png"));
+		buttonConfirm
+				.setToolTipText(Data.getInstance().getLocaleStr("confirm"));
+		buttonConfirm.addActionListener(new LanguagePopupWindowAction(this,
+				ButtonClicked.OK));
+
+		JPanel panelButtons = new JPanel(new BorderLayout());
+		panelButtons.setBackground(UI.POPUP_BACKGROUND);
+		panelButtons.setBorder(BorderFactory.createLineBorder(panelButtons
+				.getBackground(), 3));
+		panelButtons.add(buttonAbort, BorderLayout.WEST);
+		panelButtons.add(buttonConfirm, BorderLayout.EAST);
+
+		/*
+		 * Base panel
+		 */
+		panelBase.add(panelButtons, BorderLayout.SOUTH);
+
+		add(panelBase, BorderLayout.CENTER);
+
+		/*
+		 * Set size and location
+		 */
+		Dimension popupSize = new Dimension(130, 170);
+
+		setMinimumSize(popupSize);
+		setSize(popupSize);
+		setPreferredSize(popupSize);
+
+		pack();
+
+		setAlwaysOnTop(true);
+		toFront();
+
+		GUITools.setLocationToCursorPos(this);
+	}
+
+	/**
+	 * Gets the button clicked.
+	 * 
+	 * @return the buttonClicked
+	 */
+	public ButtonClicked getButtonClicked() {
+		return buttonClicked;
+	}
+
+	/**
+	 * Sets the button clicked.
+	 * 
+	 * @param buttonClicked
+	 *            the buttonClicked to set
+	 */
+	public void setButtonClicked(ButtonClicked buttonClicked) {
+		this.buttonClicked = buttonClicked;
+	}
+
+}
 
=== added file 'src/org/revager/gui/dialogs/assistant/OpenReviewPanel.java'
--- src/org/revager/gui/dialogs/assistant/OpenReviewPanel.java	1970-01-01 00:00:00 +0000
+++ src/org/revager/gui/dialogs/assistant/OpenReviewPanel.java	2010-05-26 20:44:25 +0000
@@ -0,0 +1,310 @@
+/* 
+ * Copyright 2009 Davide Casciato, Sandra Reich, Johannes Wettinger
+ * 
+ * This file is part of Resi.
+ *
+ * Resi is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Resi is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Resi. If not, see <http://www.gnu.org/licenses/>.
+ */
+package org.revager.gui.dialogs.assistant;
+
+import java.awt.Font;
+import java.awt.GridBagConstraints;
+import java.awt.GridBagLayout;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.io.File;
+import java.util.List;
+import java.util.Vector;
+
+import javax.swing.ImageIcon;
+import javax.swing.JLabel;
+import javax.swing.JOptionPane;
+import javax.swing.JSeparator;
+import javax.swing.SwingConstants;
+
+import org.revager.app.ResiFileFilter;
+import org.revager.app.model.Data;
+import org.revager.app.model.DataException;
+import org.revager.gui.AbstractDialog;
+import org.revager.gui.AbstractDialogPanel;
+import org.revager.gui.UI;
+import org.revager.gui.helpers.FileChooser;
+import org.revager.gui.helpers.HLink;
+import org.revager.gui.helpers.LinkGroup;
+import org.revager.gui.workers.LoadReviewWorker;
+import org.revager.tools.GUITools;
+
+/**
+ * The class OpenReviewPanel.
+ * 
+ * @author D.Casciato
+ *
+ */
+@SuppressWarnings("serial")
+public class OpenReviewPanel extends AbstractDialogPanel{
+
+	private GridBagLayout gbl2 = new GridBagLayout();
+	
+
+	/*
+	 * Strings
+	 */
+	private String moderatorStrng = Data.getInstance().getLocaleStr(
+			"mode.moderator");
+	private String scribeStrng = Data.getInstance().getLocaleStr(
+			"mode.scribeOrSingle");
+	private String anotherRevStrng = Data.getInstance().getLocaleStr(
+			"assistantDialog.selectAnotherRev");
+	private String noRevsStrng = Data.getInstance().getLocaleStr(
+			"assistantDialog.noRevs");;
+	private String firstRevStrng;
+	private String secondRevStrng;
+	private String thirdRevStrng;
+	private String fourthRevStrng;
+
+	/*
+	 * ImageIcons
+	 */
+	private ImageIcon smallModeratorIcon = Data.getInstance().getIcon(
+			"moderator_50x50_0.png");
+	private ImageIcon smallModeratorRolloverIcon = Data.getInstance().getIcon(
+			"moderator_50x50.png");
+	private ImageIcon scribeIcon = Data.getInstance().getIcon(
+			"scribe_50x50_0.png");
+	private ImageIcon scribeRolloverIcon = Data.getInstance().getIcon(
+			"scribe_50x50.png");
+	private ImageIcon reviewIcon = Data.getInstance().getIcon(
+			"review_40x40_0.png");
+	private ImageIcon reviewRolloverIcon = Data.getInstance().getIcon(
+			"review_40x40.png");
+	private ImageIcon browseIcon = Data.getInstance().getIcon(
+			"open_40x40_0.png");
+	private ImageIcon browseRolloverIcon = Data.getInstance().getIcon(
+			"open_40x40.png");
+
+	/*
+	 * links and LinkGroups
+	 */
+	private LinkGroup modeGrp = new LinkGroup();
+	private HLink moderatorLnk = new HLink(moderatorStrng, smallModeratorIcon,
+			smallModeratorRolloverIcon, modeGrp);
+	private HLink scribeSingleRevLnk = new HLink(scribeStrng, scribeIcon,
+			scribeRolloverIcon, modeGrp);
+
+	private LinkGroup lastRevsGrp = new LinkGroup();
+	private HLink firstReviewLnk;
+	private HLink secondReviewLnk;
+	private HLink thirdReviewLnk;
+	private HLink fourthReviewLnk;
+	private HLink anotherReviewLnk;
+
+	/*
+	 * Others
+	 */
+	private JLabel noRevsLbl = new JLabel(noRevsStrng);
+
+	private Vector<String> lastRevsVector = getLastReviews();
+
+	/**
+	 * Action to open an existing review.
+	 */
+	public ActionListener openExistRev = new ActionListener() {
+
+		@Override
+		public void actionPerformed(ActionEvent e) {
+
+			try {
+				List<String> lastRevs = Data.getInstance().getAppData()
+						.getLastReviews();
+				int index = lastRevsGrp.getSelectedLinkIndex();
+				String revPath = lastRevs.get(index);
+				new LoadReviewWorker(revPath).execute();
+			} catch (DataException e1) {
+				// TODO Auto-generated catch block
+				e1.printStackTrace();
+			}
+
+		}
+
+	};
+
+	/**
+	 * Action to open another review. 
+	 */
+	private ActionListener openAnotherRev = new ActionListener() {
+
+		@Override
+		public void actionPerformed(ActionEvent arg0) {
+			FileChooser fileChooser = UI.getInstance().getFileChooser();
+
+			if (fileChooser.showDialog(UI.getInstance().getAssistantDialog(),
+					FileChooser.MODE_OPEN_FILE, ResiFileFilter.TYPE_REVIEW) == FileChooser.SELECTED_APPROVE) {
+				String reviewPath = fileChooser.getFile().getAbsolutePath();
+				new LoadReviewWorker(reviewPath).execute();
+			}
+		}
+	};
+	
+	/**
+	 * Returns the group of the recent reviews.
+	 * @return
+	 */
+	public LinkGroup getLastRevsGrp() {
+		return lastRevsGrp;
+	}
+
+	/**
+	 * Returns the vector of the recent reviews. 
+	 * @return
+	 */
+	public Vector<String> getLastRevsVector() {
+		return lastRevsVector;
+	}
+
+	/**
+	 * Constructor
+	 * 
+	 * @param parent
+	 */
+	public OpenReviewPanel(AbstractDialog parent) {
+		super(parent);
+		createOpenReviewPnl();
+	}
+	
+	/**
+	 * Method which creates and locates the component of this panel.
+	 */
+	private void createOpenReviewPnl() {
+
+		this.setLayout(gbl2);
+
+		moderatorLnk.addActionListener(new ActionListener() {
+
+			@Override
+			public void actionPerformed(ActionEvent e) {
+				UI.getInstance().getAssistantDialog().setLocalMode("moderator");
+				Data.getInstance().setMode("moderator");
+			}
+		});
+
+		scribeSingleRevLnk.addActionListener(new ActionListener() {
+
+			@Override
+			public void actionPerformed(ActionEvent e) {
+				UI.getInstance().getAssistantDialog().setLocalMode("scribe");
+				Data.getInstance().setMode("scribe");
+			}
+		});
+
+		modeGrp.addLink(moderatorLnk);
+		modeGrp.addLink(scribeSingleRevLnk);
+		modeGrp.selectLink(moderatorLnk);
+
+		GUITools.addComponent(this, gbl2, moderatorLnk, 0, 0, 1, 1,
+				0.5, 0.0, 0, 20, 0, 20, GridBagConstraints.HORIZONTAL,
+				GridBagConstraints.NORTHWEST);
+		GUITools.addComponent(this, gbl2, scribeSingleRevLnk, 0, 1,
+				1, 2, 0.5, 0.0, 20, 20, 0, 20, GridBagConstraints.HORIZONTAL,
+				GridBagConstraints.NORTHWEST);
+		GUITools.addComponent(this, gbl2, new JSeparator(
+				SwingConstants.VERTICAL), 1, 0, 1, 6, 0.0, 1.0, 0, 0, 0, 0,
+				GridBagConstraints.VERTICAL, GridBagConstraints.NORTHWEST);
+
+		try {
+			firstRevStrng = lastRevsVector.get(0);
+			firstReviewLnk = new HLink(firstRevStrng, reviewIcon,
+					reviewRolloverIcon, lastRevsGrp);
+			lastRevsGrp.addLink(firstReviewLnk);
+			lastRevsGrp.selectLink(firstReviewLnk);
+			GUITools.addComponent(this, gbl2, firstReviewLnk, 2, 0,
+					1, 1, 1.0, 0.0, 0, 40, 0, 0, GridBagConstraints.HORIZONTAL,
+					GridBagConstraints.NORTHWEST);
+
+		} catch (Exception e) {
+			noRevsLbl.setFont(new Font(Font.SANS_SERIF, Font.ITALIC, 12));
+			GUITools.addComponent(this, gbl2, noRevsLbl, 2, 0, 1, 1,
+					1.0, 0.0, 15, 80, 0, 0, GridBagConstraints.HORIZONTAL,
+					GridBagConstraints.NORTHWEST);
+		}
+		try {
+			secondRevStrng = lastRevsVector.get(1);
+			secondReviewLnk = new HLink(secondRevStrng, reviewIcon,
+					reviewRolloverIcon, lastRevsGrp);
+			lastRevsGrp.addLink(secondReviewLnk);
+			GUITools.addComponent(this, gbl2, secondReviewLnk, 2, 1,
+					1, 1, 1.0, 0.0, 0, 40, 0, 0, GridBagConstraints.HORIZONTAL,
+					GridBagConstraints.NORTHWEST);
+
+		} catch (Exception e) {
+
+		}
+		try {
+			thirdRevStrng = lastRevsVector.get(2);
+			thirdReviewLnk = new HLink(thirdRevStrng, reviewIcon,
+					reviewRolloverIcon, lastRevsGrp);
+			lastRevsGrp.addLink(thirdReviewLnk);
+			GUITools.addComponent(this, gbl2, thirdReviewLnk, 2, 2,
+					1, 1, 1.0, 0.0, 0, 40, 0, 0, GridBagConstraints.HORIZONTAL,
+					GridBagConstraints.NORTHWEST);
+
+		} catch (Exception e) {
+
+		}
+
+		try {
+			fourthRevStrng = lastRevsVector.get(3);
+			fourthReviewLnk = new HLink(fourthRevStrng, reviewIcon,
+					reviewRolloverIcon, lastRevsGrp);
+			lastRevsGrp.addLink(fourthReviewLnk);
+			GUITools
+					.addComponent(this, gbl2, fourthReviewLnk, 2, 3,
+							1, 1, 1.0, 0.0, 0, 40, 0, 0,
+							GridBagConstraints.HORIZONTAL,
+							GridBagConstraints.NORTHWEST);
+
+		} catch (Exception e) {
+
+		}
+		anotherReviewLnk = new HLink(anotherRevStrng, browseIcon,
+				browseRolloverIcon, null);
+		anotherReviewLnk.setUnderlined(true);
+		anotherReviewLnk.addActionListener(openAnotherRev);
+		GUITools.addComponent(this, gbl2, anotherReviewLnk, 2, 4, 1,
+				1, 1.0, 1.0, 30, 40, 0, 0, GridBagConstraints.HORIZONTAL,
+				GridBagConstraints.SOUTHWEST);
+
+	}
+	
+	/**
+	 * Gets the last reviews.
+	 * 
+	 * @return the last reviews
+	 */
+	private Vector<String> getLastReviews() {
+		Vector<String> vecLastReviews = new Vector<String>();
+
+		try {
+			for (String rev : Data.getInstance().getAppData().getLastReviews()) {
+				vecLastReviews.add(new File(rev).getName());
+			}
+		} catch (DataException exc) {
+			JOptionPane.showMessageDialog(null, GUITools.getMessagePane(exc
+					.getMessage()), Data.getInstance().getLocaleStr("error"),
+					JOptionPane.ERROR_MESSAGE);
+		}
+
+		return vecLastReviews;
+	}
+
+}
 
=== added file 'src/org/revager/gui/helpers/HLink.java'
--- src/org/revager/gui/helpers/HLink.java	1970-01-01 00:00:00 +0000
+++ src/org/revager/gui/helpers/HLink.java	2010-05-26 20:44:25 +0000
@@ -0,0 +1,526 @@
+/* 
+ * Copyright 2009 Davide Casciato, Sandra Reich, Johannes Wettinger
+ * 
+ * This file is part of Resi.
+ *
+ * Resi is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Resi is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Resi. If not, see <http://www.gnu.org/licenses/>.
+ */
+package org.revager.gui.helpers;
+
+import java.awt.Color;
+import java.awt.Cursor;
+import java.awt.Dimension;
+import java.awt.Font;
+import java.awt.GridBagConstraints;
+import java.awt.GridBagLayout;
+import java.awt.event.ActionListener;
+import java.awt.event.MouseEvent;
+import java.awt.event.MouseListener;
+
+import javax.swing.ImageIcon;
+import javax.swing.JButton;
+import javax.swing.JLabel;
+import javax.swing.JPanel;
+
+import org.revager.gui.AbstractDialogPanel;
+import org.revager.tools.GUITools;
+
+/**
+ * The class HLink.
+ * 
+ * @author D.Casciato
+ * 
+ */
+@SuppressWarnings("serial")
+public class HLink extends JPanel {
+
+	private String localTextStrng;
+	private JLabel localLbl;
+	private ImageIcon localIcon;
+	private ImageIcon localSelIcon;
+	private ImageIcon localDisIcon;
+	private ImageIcon localRolloverIcon;
+	private JButton localBttn;
+	private GridBagLayout gbl = new GridBagLayout();
+	private Font localFont = new Font(Font.DIALOG, Font.PLAIN, 11);
+	private JPanel localPnl = this;
+	private ActionListener localAction = null;
+	private LinkGroup localGroup;
+	private Boolean selected = false;
+	private AbstractDialogPanel father = null;
+	private String rollOverText = "";
+
+	/**
+	 * Returns the father of the component. Father means the same as parent.
+	 * 
+	 * @return
+	 */
+	public AbstractDialogPanel getFather() {
+		return father;
+	}
+
+	/**
+	 * Sets the father of the component.
+	 * 
+	 * @return
+	 */
+	public void setFather(AbstractDialogPanel parent) {
+		this.father = parent;
+	}
+
+	/**
+	 * Returns if the link is selected or not. Important when using the link as
+	 * RadioButton.
+	 * 
+	 * @return
+	 */
+	public Boolean getSelected() {
+		return selected;
+	}
+
+	/**
+	 * Listener which selects the link by mouse click.
+	 */
+	private MouseListener selectionListener = new MouseListener() {
+
+		@Override
+		public void mouseClicked(MouseEvent e) {
+			if (localGroup != null)
+				localGroup.deselectAllLinks();
+			if (!selected)
+				selected = true;
+		}
+
+		@Override
+		public void mouseEntered(MouseEvent e) {
+			// TODO Auto-generated method stub
+
+		}
+
+		@Override
+		public void mouseExited(MouseEvent e) {
+			// TODO Auto-generated method stub
+
+		}
+
+		@Override
+		public void mousePressed(MouseEvent e) {
+			// TODO Auto-generated method stub
+
+		}
+
+		@Override
+		public void mouseReleased(MouseEvent e) {
+			// TODO Auto-generated method stub
+
+		};
+	};
+
+	/**
+	 * Listener which changes the design of the link depending on the use of the
+	 * link. If a group exists the link is used as radio button. Else it's used
+	 * only as link.
+	 */
+	private MouseListener localListener = new MouseListener() {
+
+		@Override
+		public void mouseClicked(MouseEvent e) {
+			if (localGroup == null) {
+				localLbl.setForeground(Color.BLUE);
+				localBttn.setSelected(true);
+				setCursor(new Cursor(Cursor.HAND_CURSOR));
+				// setBold(true);
+			} else {
+				localGroup.resetAllLinks();
+				localBttn.setIcon(localSelIcon);
+				localBttn.setRolloverIcon(localSelIcon);
+				localLbl.setForeground(Color.BLUE);
+				setCursor(new Cursor(Cursor.HAND_CURSOR));
+				setSelected(true);
+				// setBold(true);
+			}
+
+		}
+
+		@Override
+		public void mouseEntered(MouseEvent e) {
+			if (localGroup == null) {
+				localLbl.setForeground(Color.BLUE);
+				localBttn.setSelected(true);
+				setCursor(new Cursor(Cursor.HAND_CURSOR));
+				// setBold(true);
+			} else {
+				setCursor(new Cursor(Cursor.HAND_CURSOR));
+				setUnderlined(true);
+			}
+		}
+
+		@Override
+		public void mouseExited(MouseEvent e) {
+			if (localGroup == null) {
+				localLbl.setForeground(Color.BLACK);
+				localBttn.setSelected(false);
+				setCursor(new Cursor(Cursor.DEFAULT_CURSOR));
+				// setBold(false);
+			} else {
+				setCursor(new Cursor(Cursor.DEFAULT_CURSOR));
+				setUnderlined(false);
+			}
+		}
+
+		@Override
+		public void mousePressed(MouseEvent e) {
+			// TODO Auto-generated method stub
+
+		}
+
+		@Override
+		public void mouseReleased(MouseEvent e) {
+			// TODO Auto-generated method stub
+
+		}
+	};
+
+	/**
+	 * Returns the icon of the non-selected state.
+	 * 
+	 * @return
+	 */
+	public ImageIcon getLocalDisIcon() {
+		return localDisIcon;
+	}
+
+	/**
+	 * Sets the icon of the non-selected state.
+	 * 
+	 * @return
+	 */
+	public void setLocalDisIcon(ImageIcon localDisIcon) {
+		this.localDisIcon = localDisIcon;
+	}
+
+	/**
+	 * Returns the button of the link which contains the icon.
+	 * 
+	 * @return
+	 */
+	public JButton getLocalBttn() {
+		return localBttn;
+	}
+
+	/**
+	 * Sets the text of the link.
+	 * 
+	 * @param localTextStrng
+	 */
+	public void setLocalTextStrng(String localTextStrng) {
+		this.localTextStrng = localTextStrng;
+	}
+
+	/**
+	 * Sets the icon of the link.
+	 * 
+	 * @param localIcon
+	 */
+	public void setLocalIcon(ImageIcon localIcon) {
+		this.localIcon = localIcon;
+		localBttn.setIcon(localIcon);
+	}
+
+	/**
+	 * Sets the rollover icon of the link.
+	 * 
+	 * @param localRolloverIcon
+	 */
+	public void setLocalRolloverIcon(ImageIcon localRolloverIcon) {
+		this.localRolloverIcon = localRolloverIcon;
+		localBttn.setRolloverIcon(localRolloverIcon);
+	}
+
+	/**
+	 * Returns the icon of the link.
+	 * 
+	 * @return
+	 */
+	public ImageIcon getLocalIcon() {
+		return localIcon;
+	}
+
+	/**
+	 * Returns the rollover icon of the link.
+	 * 
+	 * @return
+	 */
+	public ImageIcon getLocalRolloverIcon() {
+		return localRolloverIcon;
+	}
+
+	/**
+	 * Sets the text underlined if isUnderlined is true.
+	 * 
+	 * @param isUnderlined
+	 */
+	public void setUnderlined(Boolean isUnderlined) {
+		if (isUnderlined)
+			localLbl.setText("<html><u>" + localTextStrng + "</u></html>");
+		else
+			localLbl.setText("<html>" + localTextStrng + "</html>");
+	}
+
+	/**
+	 * Sets the text italic if isItalic is true.
+	 * 
+	 * @param isItalic
+	 */
+	public void setItalic(Boolean isItalic) {
+		if (isItalic)
+			localFont = new Font(Font.DIALOG, Font.ITALIC, 11);
+		else
+			localFont = new Font(Font.DIALOG, Font.PLAIN, 11);
+
+	}
+
+	/**
+	 * Sets the text bold if isBold is true.
+	 * 
+	 * @param isBold
+	 */
+	public void setBold(Boolean isBold) {
+		if (isBold) {
+			localFont = new Font(Font.DIALOG, Font.BOLD, 11);
+			localLbl.setFont(localFont);
+			localLbl.validate();
+			localLbl.repaint();
+			this.validate();
+			this.repaint();
+		} else {
+			localFont = new Font(Font.DIALOG, Font.PLAIN, 11);
+			localLbl.setFont(localFont);
+			localLbl.validate();
+			localLbl.repaint();
+			this.validate();
+			this.repaint();
+
+		}
+	}
+
+	/**
+	 * Sets the color of the text.
+	 * 
+	 * @param color
+	 */
+	public void setColor(Color color) {
+		localLbl.setForeground(color);
+	}
+
+	/**
+	 * Constructor
+	 * 
+	 * @param text
+	 * @param icon
+	 * @param rolloverIcon
+	 */
+	public HLink(String text, ImageIcon icon, ImageIcon rolloverIcon,
+			LinkGroup group) {
+		super();
+		this.setLayout(gbl);
+		this.localGroup = group;
+		localIcon = icon;
+		localRolloverIcon = rolloverIcon;
+		localSelIcon = rolloverIcon;
+		localDisIcon = icon;
+		if (group == null)
+			localBttn = GUITools.newImageButton(localIcon, localRolloverIcon);
+		else
+			localBttn = GUITools.newImageButton(localIcon, localIcon);
+
+		localTextStrng = text;
+		localLbl = new JLabel("<html>" + localTextStrng + "</html>");
+
+		this.addMouseListener(localListener);
+		localLbl.addMouseListener(localListener);
+		localBttn.addMouseListener(localListener);
+		localBttn.addMouseListener(selectionListener);
+		localLbl.addMouseListener(selectionListener);
+
+		GUITools.addComponent(localPnl, gbl, localBttn, 0, 0, 1, 1, 0.0, 1.0,
+				0, 0, 0, 0, GridBagConstraints.BOTH,
+				GridBagConstraints.NORTHWEST);
+		GUITools
+				.addComponent(localPnl, gbl, localLbl, 1, 0, 1, 1, 1.0, 1.0, 0,
+						5, 0, 0, GridBagConstraints.BOTH,
+						GridBagConstraints.NORTHWEST);
+
+		Dimension size = new Dimension(10, 50);
+		setMinimumSize(size);
+		setPreferredSize(size);
+	}
+
+	/**
+	 * Method for adding an action to the links subcomponents.
+	 * 
+	 * @param action
+	 */
+	public void addActionListener(ActionListener action) {
+		localAction = action;
+		localBttn.addMouseListener(new MouseListener() {
+
+			@Override
+			public void mouseClicked(MouseEvent e) {
+				localAction.actionPerformed(null);
+			}
+
+			@Override
+			public void mouseEntered(MouseEvent e) {
+				// TODO Auto-generated method stub
+
+			}
+
+			@Override
+			public void mouseExited(MouseEvent e) {
+				// TODO Auto-generated method stub
+
+			}
+
+			@Override
+			public void mousePressed(MouseEvent e) {
+				// TODO Auto-generated method stub
+
+			}
+
+			@Override
+			public void mouseReleased(MouseEvent e) {
+				// TODO Auto-generated method stub
+
+			}
+		});
+		localLbl.addMouseListener(new MouseListener() {
+
+			@Override
+			public void mouseClicked(MouseEvent e) {
+				localAction.actionPerformed(null);
+
+			}
+
+			@Override
+			public void mouseEntered(MouseEvent e) {
+				// TODO Auto-generated method stub
+
+			}
+
+			@Override
+			public void mouseExited(MouseEvent e) {
+				// TODO Auto-generated method stub
+
+			}
+
+			@Override
+			public void mousePressed(MouseEvent e) {
+				// TODO Auto-generated method stub
+
+			}
+
+			@Override
+			public void mouseReleased(MouseEvent e) {
+				// TODO Auto-generated method stub
+
+			}
+		});
+	}
+
+	/**
+	 * Sets the link selected or not.
+	 * 
+	 * @param b
+	 */
+	public void setSelected(boolean b) {
+		selected = b;
+	}
+
+	/**
+	 * Returns the selection icon of the link.
+	 * 
+	 * @return
+	 */
+	public ImageIcon getLocalSelIcon() {
+		// TODO Auto-generated method stub
+		return localSelIcon;
+	}
+
+	/**
+	 * Method which adds the rollover text for the messages in AbstractDialog
+	 * extended classes.
+	 * 
+	 * @param rolloverText
+	 */
+	public void addRolloverText(String rolloverText) {
+		if (father != null) {
+			this.rollOverText = rolloverText;
+			localLbl.removeMouseListener(rolloverListener);
+			localBttn.removeMouseListener(rolloverListener);
+
+			localLbl.addMouseListener(rolloverListener);
+			localBttn.addMouseListener(rolloverListener);
+		}
+	}
+
+	/**
+	 * Listener which sets the message of the father component.
+	 */
+	private MouseListener rolloverListener = new MouseListener() {
+
+		@Override
+		public void mouseClicked(MouseEvent e) {
+			// TODO Auto-generated method stub
+
+		}
+
+		@Override
+		public void mouseEntered(MouseEvent e) {
+			if (father != null)
+				father.setHint(rollOverText);
+
+		}
+
+		@Override
+		public void mouseExited(MouseEvent e) {
+			if (father != null)
+				father.setHint(null);
+
+		}
+
+		@Override
+		public void mousePressed(MouseEvent e) {
+			// TODO Auto-generated method stub
+
+		}
+
+		@Override
+		public void mouseReleased(MouseEvent e) {
+			// TODO Auto-generated method stub
+
+		}
+	};
+
+	/**
+	 * Returns the label of the link.
+	 * 
+	 * @return
+	 */
+	public JLabel getLocalLbl() {
+		// TODO Auto-generated method stub
+		return localLbl;
+	}
+
+}
 \ No newline at end of file
 
=== added file 'src/org/revager/gui/helpers/LinkGroup.java'
--- src/org/revager/gui/helpers/LinkGroup.java	1970-01-01 00:00:00 +0000
+++ src/org/revager/gui/helpers/LinkGroup.java	2010-05-26 20:44:25 +0000
@@ -0,0 +1,113 @@
+/* 
+ * Copyright 2009 Davide Casciato, Sandra Reich, Johannes Wettinger
+ * 
+ * This file is part of Resi.
+ *
+ * Resi is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Resi is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Resi. If not, see <http://www.gnu.org/licenses/>.
+ */
+package org.revager.gui.helpers;
+
+import java.awt.Color;
+import java.util.ArrayList;
+import java.util.List;
+/**
+ * The class LinkGroup.
+ * 
+ * @author D.Casciato
+ *
+ */
+public class LinkGroup {
+
+	private List<HLink> hLinksList = new ArrayList<HLink>();
+
+	/**
+	 * Method which adds an Link to the LinkGroup.
+	 * @param link
+	 */
+	public void addLink(HLink link) {
+		hLinksList.add(link);
+		link.setLocalRolloverIcon(link.getLocalIcon());
+	}
+
+	/**
+	 * Method which resets the look of the links.
+	 */
+	public void resetAllLinks() {
+		for (HLink link : hLinksList) {
+			//link.setBold(false);
+			link.setColor(Color.BLACK);
+			link.setLocalRolloverIcon(link.getLocalDisIcon());
+			link.setLocalIcon(link.getLocalDisIcon());
+
+		}
+	}
+
+	/**
+	 * Method which selects the given link in the LinkGroup.
+	 * 
+	 * @param selLink
+	 */
+	public void selectLink(HLink selLink) {
+		for (HLink link : hLinksList) {
+			if (link == selLink) {
+				//link.setBold(true);
+				link.setColor(Color.BLUE);
+				link.setLocalRolloverIcon(link.getLocalSelIcon());
+				link.setLocalIcon(link.getLocalSelIcon());
+				link.setSelected(true);
+			} else {
+				//link.setBold(false);
+				link.setColor(Color.BLACK);
+				link.setLocalRolloverIcon(link.getLocalDisIcon());
+				link.setLocalIcon(link.getLocalDisIcon());
+				link.setSelected(false);
+			}
+		}
+	}
+
+	/**
+	 * Returns the text of the selected Link.
+	 * @return
+	 */
+	public String getSelectedLinkText() {
+		for (HLink link : hLinksList) {
+			if (link.getSelected())
+				return link.getLocalLbl().getText();
+		}
+		return null;
+	}
+
+	/**
+	 * Returns the index of the selected Link.
+	 * @return
+	 */
+	public int getSelectedLinkIndex() {
+		for (int index = 0; index < hLinksList.size(); index++) {
+			if (hLinksList.get(index).getSelected())
+				return index;
+		}
+		return -1;
+	}
+
+	/**
+	 * Method which deselects all Links.
+	 */
+	public void deselectAllLinks() {
+		for (HLink link : hLinksList) {
+			link.setSelected(false);
+		}
+
+	}
+
+}
 
=== added file 'src/org/revager/gui/helpers/VLink.java'
--- src/org/revager/gui/helpers/VLink.java	1970-01-01 00:00:00 +0000
+++ src/org/revager/gui/helpers/VLink.java	2010-05-26 20:44:25 +0000
@@ -0,0 +1,359 @@
+/* 
+ * Copyright 2009 Davide Casciato, Sandra Reich, Johannes Wettinger
+ * 
+ * This file is part of Resi.
+ *
+ * Resi is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Resi is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Resi. If not, see <http://www.gnu.org/licenses/>.
+ */
+package org.revager.gui.helpers;
+
+import java.awt.Color;
+import java.awt.Cursor;
+import java.awt.Dimension;
+import java.awt.Font;
+import java.awt.GridBagConstraints;
+import java.awt.GridBagLayout;
+import java.awt.event.ActionListener;
+import java.awt.event.MouseEvent;
+import java.awt.event.MouseListener;
+
+import javax.swing.ImageIcon;
+import javax.swing.JButton;
+import javax.swing.JLabel;
+import javax.swing.JPanel;
+
+import org.revager.gui.AbstractDialogPanel;
+import org.revager.tools.GUITools;
+
+/**
+ * The class VLink. Temporarily not usable as radiobutton.
+ * 
+ * @author D.Casciato
+ * 
+ */
+@SuppressWarnings("serial")
+public class VLink extends JPanel {
+
+	private String localTextStrng;
+	private JLabel localLbl;
+	private ImageIcon localIcon;
+	private ImageIcon localRolloverIcon;
+	private JButton localBttn;
+	private GridBagLayout gbl = new GridBagLayout();
+	private Font localFont = new Font(Font.DIALOG, Font.PLAIN, 12);
+	private Font boldFont = new Font(Font.DIALOG, Font.BOLD, 12);
+	private JPanel localPnl = this;
+	private ActionListener localAction = null;
+	private AbstractDialogPanel father = null;
+	private String rollOverText = "";
+
+	/**
+	 * Returns the father of the component. Father means the same as parent.
+	 * 
+	 * @return
+	 */
+	public AbstractDialogPanel getFather() {
+		return father;
+	}
+
+	/**
+	 * Sets the father of the component.
+	 * 
+	 * @return
+	 */
+	public void setFather(AbstractDialogPanel parent) {
+		this.father = parent;
+	}
+
+	/**
+	 * Listener for the rollover effect.
+	 */
+	private MouseListener localListener = new MouseListener() {
+
+		@Override
+		public void mouseClicked(MouseEvent e) {
+			localLbl.setForeground(Color.BLACK);
+			localBttn.setSelected(false);
+			setCursor(new Cursor(Cursor.DEFAULT_CURSOR));
+//			setBold(false);
+		}
+
+		@Override
+		public void mouseEntered(MouseEvent e) {
+			localLbl.setForeground(Color.BLUE);
+			localBttn.setSelected(true);
+			setCursor(new Cursor(Cursor.HAND_CURSOR));
+//			setBold(true);
+			localLbl.revalidate();
+		}
+
+		@Override
+		public void mouseExited(MouseEvent e) {
+			localLbl.setForeground(Color.BLACK);
+			localBttn.setSelected(false);
+			setCursor(new Cursor(Cursor.DEFAULT_CURSOR));
+//			setBold(false);
+		}
+
+		@Override
+		public void mousePressed(MouseEvent e) {
+			// TODO Auto-generated method stub
+
+		}
+
+		@Override
+		public void mouseReleased(MouseEvent e) {
+			// TODO Auto-generated method stub
+
+		}
+	};
+
+	/**
+	 * Sets the text of the link.
+	 * 
+	 * @param localTextStrng
+	 */
+	public void setLocalTextStrng(String localTextStrng) {
+		this.localTextStrng = localTextStrng;
+	}
+
+	/**
+	 * Sets the icon of the link.
+	 * 
+	 * @param localIcon
+	 */
+	public void setLocalIcon(ImageIcon localIcon) {
+		this.localIcon = localIcon;
+	}
+
+	/**
+	 * Sets the rollover icon of the link.
+	 * 
+	 * @param localRolloverIcon
+	 */
+	public void setLocalRolloverIcon(ImageIcon localRolloverIcon) {
+		this.localRolloverIcon = localRolloverIcon;
+	}
+
+	/**
+	 * Sets the link underlined if isUnderlined is true.
+	 * 
+	 * @param isUnderlined
+	 */
+	public void setUnderlined(Boolean isUnderlined) {
+		if (isUnderlined)
+			localLbl.setText("<html><U>" + localTextStrng + "</html>");
+		else
+			localLbl.setText(localTextStrng);
+	}
+
+	/**
+	 * Sets the text italic if isItalic is true. Else the text will be plain.
+	 * 
+	 * @param isItalic
+	 */
+	public void setItalic(Boolean isItalic) {
+		if (isItalic)
+			localFont = new Font(Font.DIALOG, Font.ITALIC, 12);
+		else
+			localFont = new Font(Font.DIALOG, Font.PLAIN, 12);
+
+	}
+
+	/**
+	 * Sets the text bold if isBold is true.
+	 * 
+	 * @param isBold
+	 */
+	public void setBold(Boolean isBold) {
+		if (isBold) {
+			localFont = new Font(Font.DIALOG, Font.BOLD, 12);
+			localLbl.setFont(localFont);
+			this.validate();
+			localLbl.repaint();
+		} else {
+			localFont = new Font(Font.DIALOG, Font.PLAIN, 12);
+			localLbl.setFont(localFont);
+			this.validate();
+			localLbl.repaint();
+		}
+	}
+
+	/**
+	 * Sets the color of the text.
+	 * 
+	 * @param color
+	 */
+	public void setColor(Color color) {
+		localLbl.setForeground(color);
+	}
+
+	/**
+	 * Constructor
+	 * 
+	 * @param text
+	 * @param icon
+	 * @param rolloverIcon
+	 */
+	public VLink(String text, ImageIcon icon, ImageIcon rolloverIcon) {
+		super();
+		this.setLayout(gbl);
+		localIcon = icon;
+		localRolloverIcon = rolloverIcon;
+		localBttn = GUITools.newImageButton(localIcon, localRolloverIcon);
+		localTextStrng = text;
+		localLbl = new JLabel("<html><U>" + localTextStrng + "</html>");
+		localLbl.setFont(boldFont);
+		Dimension prefSize = localLbl.getPreferredSize();
+		localLbl.setFont(localFont);
+		localLbl.setMinimumSize(prefSize);
+
+		this.addMouseListener(localListener);
+		localLbl.addMouseListener(localListener);
+		localBttn.addMouseListener(localListener);
+
+		GUITools.addComponent(localPnl, gbl, localBttn, 0, 0, 1, 1, 0.0, 0.0,
+				0, 0, 0, 0, GridBagConstraints.NONE, GridBagConstraints.NORTH);
+		GUITools.addComponent(localPnl, gbl, localLbl, 0, 1, 1, 1, 0.0, 0.0, 5,
+				0, 0, 0, GridBagConstraints.NONE, GridBagConstraints.NORTH);
+
+	}
+
+	/**
+	 * Method for adding an action to the links subcomponents.
+	 * 
+	 * @param action
+	 */
+	public void addActionListener(ActionListener action) {
+		localAction = action;
+		localBttn.addMouseListener(new MouseListener() {
+
+			@Override
+			public void mouseClicked(MouseEvent e) {
+				localAction.actionPerformed(null);
+			}
+
+			@Override
+			public void mouseEntered(MouseEvent e) {
+				// TODO Auto-generated method stub
+
+			}
+
+			@Override
+			public void mouseExited(MouseEvent e) {
+				// TODO Auto-generated method stub
+
+			}
+
+			@Override
+			public void mousePressed(MouseEvent e) {
+				// TODO Auto-generated method stub
+
+			}
+
+			@Override
+			public void mouseReleased(MouseEvent e) {
+				// TODO Auto-generated method stub
+
+			}
+		});
+		localLbl.addMouseListener(new MouseListener() {
+
+			@Override
+			public void mouseClicked(MouseEvent e) {
+				localAction.actionPerformed(null);
+			}
+
+			@Override
+			public void mouseEntered(MouseEvent e) {
+				// TODO Auto-generated method stub
+
+			}
+
+			@Override
+			public void mouseExited(MouseEvent e) {
+				// TODO Auto-generated method stub
+
+			}
+
+			@Override
+			public void mousePressed(MouseEvent e) {
+				// TODO Auto-generated method stub
+
+			}
+
+			@Override
+			public void mouseReleased(MouseEvent e) {
+				// TODO Auto-generated method stub
+
+			}
+		});
+	}
+
+	/**
+	 * Method which adds the rollover text for the messages in AbstractDialog
+	 * extended classes.
+	 * 
+	 * @param rolloverText
+	 */
+	public void addRolloverText(String rolloverText) {
+		if (father != null) {
+			this.rollOverText = rolloverText;
+			this.removeMouseListener(rolloverListener);
+			localLbl.removeMouseListener(rolloverListener);
+			localBttn.removeMouseListener(rolloverListener);
+			this.addMouseListener(rolloverListener);
+			localLbl.addMouseListener(rolloverListener);
+			localBttn.addMouseListener(rolloverListener);
+		}
+	}
+
+	/**
+	 * Listener which sets the message of the father component.
+	 */
+	private MouseListener rolloverListener = new MouseListener() {
+
+		@Override
+		public void mouseClicked(MouseEvent e) {
+			// TODO Auto-generated method stub
+
+		}
+
+		@Override
+		public void mouseEntered(MouseEvent e) {
+			if (father != null)
+				father.setHint(rollOverText);
+
+		}
+
+		@Override
+		public void mouseExited(MouseEvent e) {
+			if (father != null)
+				father.setHint(null);
+		}
+
+		@Override
+		public void mousePressed(MouseEvent e) {
+			// TODO Auto-generated method stub
+
+		}
+
+		@Override
+		public void mouseReleased(MouseEvent e) {
+			// TODO Auto-generated method stub
+
+		}
+	};
+
+}
 
=== added file 'src/org/revager/gui/icons/aspectsManager_25x25.png'
 Binary files src/org/revager/gui/icons/aspectsManager_25x25.png	1970-01-01 00:00:00 +0000 and src/org/revager/gui/icons/aspectsManager_25x25.png	2010-05-26 20:44:25 +0000 differ
=== added file 'src/org/revager/gui/icons/aspectsManager_25x25_0.png'
 Binary files src/org/revager/gui/icons/aspectsManager_25x25_0.png	1970-01-01 00:00:00 +0000 and src/org/revager/gui/icons/aspectsManager_25x25_0.png	2010-05-26 20:44:25 +0000 differ
=== added file 'src/org/revager/gui/icons/english_31x20.png'
 Binary files src/org/revager/gui/icons/english_31x20.png	1970-01-01 00:00:00 +0000 and src/org/revager/gui/icons/english_31x20.png	2010-05-26 20:44:25 +0000 differ
=== added file 'src/org/revager/gui/icons/english_31x20_0.png'
 Binary files src/org/revager/gui/icons/english_31x20_0.png	1970-01-01 00:00:00 +0000 and src/org/revager/gui/icons/english_31x20_0.png	2010-05-26 20:44:25 +0000 differ
=== added file 'src/org/revager/gui/icons/german_31x20.png'
 Binary files src/org/revager/gui/icons/german_31x20.png	1970-01-01 00:00:00 +0000 and src/org/revager/gui/icons/german_31x20.png	2010-05-26 20:44:25 +0000 differ
=== added file 'src/org/revager/gui/icons/german_31x20_0.png'
 Binary files src/org/revager/gui/icons/german_31x20_0.png	1970-01-01 00:00:00 +0000 and src/org/revager/gui/icons/german_31x20_0.png	2010-05-26 20:44:25 +0000 differ
=== modified file 'src/org/revager/gui/icons/instantReview_128x128_0.png'
 Binary files src/org/revager/gui/icons/instantReview_128x128_0.png	2009-11-21 03:26:57 +0000 and src/org/revager/gui/icons/instantReview_128x128_0.png	2010-05-26 20:44:25 +0000 differ
=== added file 'src/org/revager/gui/icons/language_31x20.png'
 Binary files src/org/revager/gui/icons/language_31x20.png	1970-01-01 00:00:00 +0000 and src/org/revager/gui/icons/language_31x20.png	2010-05-26 20:44:25 +0000 differ
=== added file 'src/org/revager/gui/icons/language_31x20_0.png'
 Binary files src/org/revager/gui/icons/language_31x20_0.png	1970-01-01 00:00:00 +0000 and src/org/revager/gui/icons/language_31x20_0.png	2010-05-26 20:44:25 +0000 differ
=== modified file 'src/org/revager/gui/icons/moderator_128x128_0.png'
 Binary files src/org/revager/gui/icons/moderator_128x128_0.png	2009-11-21 03:26:57 +0000 and src/org/revager/gui/icons/moderator_128x128_0.png	2010-05-26 20:44:25 +0000 differ
=== added file 'src/org/revager/gui/icons/moderator_50x50.png'
 Binary files src/org/revager/gui/icons/moderator_50x50.png	1970-01-01 00:00:00 +0000 and src/org/revager/gui/icons/moderator_50x50.png	2010-05-26 20:44:25 +0000 differ
=== added file 'src/org/revager/gui/icons/moderator_50x50_0.png'
 Binary files src/org/revager/gui/icons/moderator_50x50_0.png	1970-01-01 00:00:00 +0000 and src/org/revager/gui/icons/moderator_50x50_0.png	2010-05-26 20:44:25 +0000 differ
=== added file 'src/org/revager/gui/icons/openBttn_16x16.png'
 Binary files src/org/revager/gui/icons/openBttn_16x16.png	1970-01-01 00:00:00 +0000 and src/org/revager/gui/icons/openBttn_16x16.png	2010-05-26 20:44:25 +0000 differ
=== added file 'src/org/revager/gui/icons/open_40x40.png'
 Binary files src/org/revager/gui/icons/open_40x40.png	1970-01-01 00:00:00 +0000 and src/org/revager/gui/icons/open_40x40.png	2010-05-26 20:44:25 +0000 differ
=== added file 'src/org/revager/gui/icons/open_40x40_0.png'
 Binary files src/org/revager/gui/icons/open_40x40_0.png	1970-01-01 00:00:00 +0000 and src/org/revager/gui/icons/open_40x40_0.png	2010-05-26 20:44:25 +0000 differ
=== added file 'src/org/revager/gui/icons/revager_50x50.png'
 Binary files src/org/revager/gui/icons/revager_50x50.png	1970-01-01 00:00:00 +0000 and src/org/revager/gui/icons/revager_50x50.png	2010-05-26 20:44:25 +0000 differ
=== added file 'src/org/revager/gui/icons/review_40x40.png'
 Binary files src/org/revager/gui/icons/review_40x40.png	1970-01-01 00:00:00 +0000 and src/org/revager/gui/icons/review_40x40.png	2010-05-26 20:44:25 +0000 differ
=== added file 'src/org/revager/gui/icons/review_40x40_0.png'
 Binary files src/org/revager/gui/icons/review_40x40_0.png	1970-01-01 00:00:00 +0000 and src/org/revager/gui/icons/review_40x40_0.png	2010-05-26 20:44:25 +0000 differ
=== modified file 'src/org/revager/gui/icons/scribe_128x128_0.png'
 Binary files src/org/revager/gui/icons/scribe_128x128_0.png	2009-11-21 03:26:57 +0000 and src/org/revager/gui/icons/scribe_128x128_0.png	2010-05-26 20:44:25 +0000 differ
=== added file 'src/org/revager/gui/icons/scribe_50x50.png'
 Binary files src/org/revager/gui/icons/scribe_50x50.png	1970-01-01 00:00:00 +0000 and src/org/revager/gui/icons/scribe_50x50.png	2010-05-26 20:44:25 +0000 differ
=== added file 'src/org/revager/gui/icons/scribe_50x50_0.png'
 Binary files src/org/revager/gui/icons/scribe_50x50_0.png	1970-01-01 00:00:00 +0000 and src/org/revager/gui/icons/scribe_50x50_0.png	2010-05-26 20:44:25 +0000 differ
=== modified file 'src/org/revager/gui/models/StrengthTableModel.java'
--- src/org/revager/gui/models/StrengthTableModel.java	2010-01-31 17:32:35 +0000
+++ src/org/revager/gui/models/StrengthTableModel.java	2010-05-26 20:44:25 +0000
@@ -22,7 +22,6 @@
 
 import org.revager.gui.UI;
 
-
 /**
  * The Class StrengthTableModel.
  */
@@ -46,10 +45,7 @@
 	 */
 	@Override
 	public int getRowCount() {
-		if(UI.getInstance().getAttendeeDialog().isVisible())
-			return UI.getInstance().getAttendeeDialog().getStrengthList().size();
-		else
-			return UI.getInstance().getAssistantDialog().getStrengthList().size();
+		return UI.getInstance().getAttendeeDialog().getStrengthList().size();
 	}
 
 	/*
@@ -59,11 +55,8 @@
 	 */
 	@Override
 	public Object getValueAt(int rowIndex, int columnIndex) {
-		if(UI.getInstance().getAttendeeDialog().isVisible())
-			return UI.getInstance().getAttendeeDialog().getStrengthList().get(rowIndex);
-		else
-			return UI.getInstance().getAssistantDialog().getStrengthList().get(rowIndex);
-		
+		return UI.getInstance().getAttendeeDialog().getStrengthList().get(
+				rowIndex);
 	}
 
 	/*
@@ -73,17 +66,10 @@
 	 * int, int)
 	 */
 	public void setValueAt(Object insertion, int row, int column) {
-		if(UI.getInstance().getAttendeeDialog().isVisible()){
-			UI.getInstance().getAttendeeDialog().getStrengthList().set(row,
-					(String) insertion);
-
-		}else{
-			UI.getInstance().getAssistantDialog().getStrengthList().set(row,
-					(String) insertion);
-
-		}
+		UI.getInstance().getAttendeeDialog().getStrengthList().set(row,
+				(String) insertion);
+
 		fireTableDataChanged();
-		
 	}
 
 	/*
 
=== modified file 'src/org/revager/resources/localeStrings_de.properties'
--- src/org/revager/resources/localeStrings_de.properties	2010-01-31 17:32:35 +0000
+++ src/org/revager/resources/localeStrings_de.properties	2010-05-26 20:44:25 +0000
@@ -27,6 +27,7 @@
 mode.moderator=Moderator
 mode.scribe=Notar
 mode.instant=Sofortiges Review
+mode.scribeOrSingle=Notar oder Single Reviewer
 
 
 
@@ -166,14 +167,26 @@
 ## Assistant Dialog ##
 ######################
 assistantDialog.title=RevAger Assistent
+assistantDialog.openDesc=Sie können einen Modus und Review aus den jeweiligen Listen wählen. Hierzu selektieren Sie einfach die gewünschten Links. Sofern Ihr gewünschtes Review nicht in der Liste vorhanden ist können Sie es über "Ein anderes Review wählen..." öffnen. 
+assistantDialog.firstDesc=Willkomen in RevAger!
+assistantDialog.quickRev.rollover=Wählen Sie diese Option um sofort selbst in der Rolle des Einzelreviewers mit einem Review zu beginnen. Ideal für schnelle Webseiten-, Code oder sogar Autoinspektionen.
+assistantDialog.newRev.rollover=Wählen Sie diese Option um ein neues Review als Moderator zu organisieren.
+assistantDialog.openRev.rollover=Wählen Sie diese Option um ein existierendes Review zu öffnen.
+assistantDialog.selectLanguage.rollover=Wählen Sie diese Option um die Applikations-Sprache zu ändern.
+assistantDialog.openAspectsMngr.rollover=Wählen Sie diese Option um Fragencataloge und Prüfaspekte im Prüfaspekte-Manager zu verwalten.
 assistantDialog.selectReviewDescription=Sie können ein gespeichertes Review laden oder ein neues Review anlegen.
 assistantDialog.selectModeDescription=Bitte wählen Sie den Modus aus, in dem Sie arbeiten möchten.
 assistantDialog.selectReview=Review-Datei
 assistantDialog.lastReviews=Letzte Reviews
 assistantDialog.manageCatalogs=Fragenkataloge verwalten
 assistantDialog.browseToolTip=Review aus Verzeichnis wählen
-
-
+assistantDialog.newReview=Neues Review anlegen
+assistantDialog.quickstart=Sofortiges Review
+assistantDialog.openReview=Bestehendes Review öffnen
+assistantDialog.selectLanguage=Sprache wählen
+assistantDialog.aspectsManager=Prüfaspekte-Manager öffnen
+assistantDialog.selectAnotherRev=Ein anderes Review wählen...
+assistantDialog.noRevs=Keine Reviews vorhanden
 
 #####################
 ## Settings Dialog ##
@@ -613,6 +626,8 @@
 popup.editAspect.description=Beschreibung:
 popup.editAspect.askForCategoryName=Bitte geben Sie eine Bezeichnung für die Kategorie ein.
 
+popup.language.german=Deutsch
+popup.language.english=English
 
 
 ##############
 
=== modified file 'src/org/revager/resources/localeStrings_en.properties'
--- src/org/revager/resources/localeStrings_en.properties	2010-01-31 17:32:35 +0000
+++ src/org/revager/resources/localeStrings_en.properties	2010-05-26 20:44:25 +0000
@@ -26,6 +26,7 @@
 mode.moderator=Moderator
 mode.scribe=Scribe
 mode.instant=Instant Review
+mode.scribeOrSingle=Scribe or Single Reviewer
 
 
 
@@ -165,12 +166,26 @@
 ## Assistant Dialog ##
 ######################
 assistantDialog.title=RevAger assistant
+assistantDialog.openDesc=You can select a mode and review from the respective link lists. To do this, simply select the desired links. If your desired review does not exist in these list, you can load it by using the "Select another review..."-link.
+assistantDialog.firstDesc=Welcome to RevAger!
+assistantDialog.quickRev.rollover=Choose this if you want to start a Review immediately, with you as the single Reviewer. Ideal for quick website, Code or even car inspections.
+assistantDialog.newRev.rollover=Choose this if you want to organize a Review as moderator. 
+assistantDialog.openRev.rollover=Choose this if you want to open an existing Review.
+assistantDialog.selectLanguage.rollover=Choose this if you want to change the application language.
+assistantDialog.openAspectsMngr.rollover=Choose this if you want to manage catalogs and aspects in the aspects-manager.
 assistantDialog.selectReviewDescription=In this window you are able to load a saved review or create a new one. Also you can manage the catalogs you want to work with.
 assistantDialog.selectModeDescription=Please choose one mode you want to work in.
 assistantDialog.selectReview=Review file
 assistantDialog.lastReviews=Last reviews
 assistantDialog.manageCatalogs=Manage catalogs
 assistantDialog.browseToolTip=Choose review from directory
+assistantDialog.newReview=Schedule new review
+assistantDialog.quickstart=Quickstart
+assistantDialog.openReview=Open existing review
+assistantDialog.selectLanguage=Select language
+assistantDialog.aspectsManager=Open aspects manager
+assistantDialog.selectAnotherRev=Select another review...
+assistantDialog.noRevs=No Reviews available
 
 
 
@@ -607,6 +622,8 @@
 popup.editAspect.description=Description:
 popup.editAspect.askForCategoryName=Please enter a name for the category.
 
+popup.language.german=Deutsch
+popup.language.english=English
 
 
 ##############
 
=== modified file 'src/org/revager/tools/GUITools.java'
--- src/org/revager/tools/GUITools.java	2010-01-31 17:32:35 +0000
+++ src/org/revager/tools/GUITools.java	2010-05-26 20:44:25 +0000
@@ -69,7 +69,6 @@
 import org.revager.app.model.Data;
 import org.revager.gui.UI;
 
-
 /**
  * The Class GUITools.
  */
@@ -683,5 +682,4 @@
 			}
 		});
 	}
-
 }