diff --git a/res-test/reviews.oger b/res-test/reviews.oger index 7980b14..816e372 100644 --- a/res-test/reviews.oger +++ b/res-test/reviews.oger @@ -1,4 +1,4 @@ - + @@ -10,7 +10,7 @@ - + @@ -60,7 +60,7 @@ - + @@ -68,7 +68,7 @@ - + @@ -111,69 +111,69 @@ - - - - - - - - - - + + + + + + + + + + - - - - - - - + + + + + + + - - - - - - - - - + + + + + + + + + - - - - - - + + + + + + - - - - - - - - + + + + + + + + - - - - - - - - - - + + + + + + + + + + - - - - - - - + + + + + + + diff --git a/src/data/Participant.java b/src/data/Participant.java index 921c810..9b34d99 100644 --- a/src/data/Participant.java +++ b/src/data/Participant.java @@ -1,12 +1,12 @@ /******************************************************************************* - * Copyright (c) 2014 Verena Käfer. + * Copyright (c) 2014 Verena Käfer. * All rights reserved. This program and the accompanying materials * are made available under the terms of the GNU General Public License v3.0 * which accompanies this distribution, and is available at * http://www.gnu.org/copyleft/gpl.html * * Contributors: - * Verena Käfer - initial version + * Verena Käfer - initial version *******************************************************************************/ package data; diff --git a/src/data/ParticipantTableModel.java b/src/data/ParticipantTableModel.java index 8b95790..5d54104 100644 --- a/src/data/ParticipantTableModel.java +++ b/src/data/ParticipantTableModel.java @@ -1,12 +1,12 @@ /******************************************************************************* - * Copyright (c) 2014 Verena Käfer. + * Copyright (c) 2014 Verena Käfer. * All rights reserved. This program and the accompanying materials * are made available under the terms of the GNU General Public License v3.0 * which accompanies this distribution, and is available at * http://www.gnu.org/copyleft/gpl.html * * Contributors: - * Verena Käfer - initial version + * Verena Käfer - initial version *******************************************************************************/ package data; diff --git a/src/data/Review.java b/src/data/Review.java index b718dc1..18770c1 100644 --- a/src/data/Review.java +++ b/src/data/Review.java @@ -1,12 +1,12 @@ /******************************************************************************* - * Copyright (c) 2014 Verena Käfer. + * Copyright (c) 2014 Verena Käfer. * All rights reserved. This program and the accompanying materials * are made available under the terms of the GNU General Public License v3.0 * which accompanies this distribution, and is available at * http://www.gnu.org/copyleft/gpl.html * * Contributors: - * Verena Käfer - initial version + * Verena Käfer - initial version *******************************************************************************/ package data; diff --git a/src/data/ReviewPlan.java b/src/data/ReviewPlan.java index 92655e9..827b182 100644 --- a/src/data/ReviewPlan.java +++ b/src/data/ReviewPlan.java @@ -1,12 +1,12 @@ /******************************************************************************* - * Copyright (c) 2014 Verena Käfer. + * Copyright (c) 2014 Verena Käfer. * All rights reserved. This program and the accompanying materials * are made available under the terms of the GNU General Public License v3.0 * which accompanies this distribution, and is available at * http://www.gnu.org/copyleft/gpl.html * * Contributors: - * Verena Käfer - initial version + * Verena Käfer - initial version *******************************************************************************/ package data; diff --git a/src/data/Room.java b/src/data/Room.java index 524a890..cb9c7b0 100644 --- a/src/data/Room.java +++ b/src/data/Room.java @@ -1,12 +1,12 @@ /******************************************************************************* - * Copyright (c) 2014 Verena Käfer. + * Copyright (c) 2014 Verena Käfer. * All rights reserved. This program and the accompanying materials * are made available under the terms of the GNU General Public License v3.0 * which accompanies this distribution, and is available at * http://www.gnu.org/copyleft/gpl.html * * Contributors: - * Verena Käfer - initial version + * Verena Käfer - initial version *******************************************************************************/ package data; diff --git a/src/data/RoomNode.java b/src/data/RoomNode.java index e0352af..1a15585 100644 --- a/src/data/RoomNode.java +++ b/src/data/RoomNode.java @@ -1,12 +1,12 @@ /******************************************************************************* - * Copyright (c) 2014 Verena Käfer. + * Copyright (c) 2014 Verena Käfer. * All rights reserved. This program and the accompanying materials * are made available under the terms of the GNU General Public License v3.0 * which accompanies this distribution, and is available at * http://www.gnu.org/copyleft/gpl.html * * Contributors: - * Verena Käfer - initial version + * Verena Käfer - initial version *******************************************************************************/ package data; diff --git a/src/data/RoomTreeModel.java b/src/data/RoomTreeModel.java index 620e761..089e907 100644 --- a/src/data/RoomTreeModel.java +++ b/src/data/RoomTreeModel.java @@ -1,12 +1,12 @@ /******************************************************************************* - * Copyright (c) 2014 Verena Käfer. + * Copyright (c) 2014 Verena Käfer. * All rights reserved. This program and the accompanying materials * are made available under the terms of the GNU General Public License v3.0 * which accompanies this distribution, and is available at * http://www.gnu.org/copyleft/gpl.html * * Contributors: - * Verena Käfer - initial version + * Verena Käfer - initial version *******************************************************************************/ package data; diff --git a/src/data/Slot.java b/src/data/Slot.java index 2464c7e..bebc886 100644 --- a/src/data/Slot.java +++ b/src/data/Slot.java @@ -1,12 +1,12 @@ /******************************************************************************* - * Copyright (c) 2014 Verena Käfer. + * Copyright (c) 2014 Verena Käfer. * All rights reserved. This program and the accompanying materials * are made available under the terms of the GNU General Public License v3.0 * which accompanies this distribution, and is available at * http://www.gnu.org/copyleft/gpl.html * * Contributors: - * Verena Käfer - initial version + * Verena Käfer - initial version *******************************************************************************/ package data; diff --git a/src/data/SlotNode.java b/src/data/SlotNode.java index f53bc49..70731c4 100644 --- a/src/data/SlotNode.java +++ b/src/data/SlotNode.java @@ -1,12 +1,12 @@ /******************************************************************************* - * Copyright (c) 2014 Verena Käfer. + * Copyright (c) 2014 Verena Käfer. * All rights reserved. This program and the accompanying materials * are made available under the terms of the GNU General Public License v3.0 * which accompanies this distribution, and is available at * http://www.gnu.org/copyleft/gpl.html * * Contributors: - * Verena Käfer - initial version + * Verena Käfer - initial version *******************************************************************************/ package data; diff --git a/src/data/SortSlot.java b/src/data/SortSlot.java index ac2d0ab..f5204b1 100644 --- a/src/data/SortSlot.java +++ b/src/data/SortSlot.java @@ -1,12 +1,12 @@ /******************************************************************************* - * Copyright (c) 2014 Verena Käfer. + * Copyright (c) 2014 Verena Käfer. * All rights reserved. This program and the accompanying materials * are made available under the terms of the GNU General Public License v3.0 * which accompanies this distribution, and is available at * http://www.gnu.org/copyleft/gpl.html * * Contributors: - * Verena Käfer - initial version + * Verena Käfer - initial version *******************************************************************************/ package data; diff --git a/src/gui/ExecutingFrame.java b/src/gui/ExecutingFrame.java index 81eb0b1..97d6b00 100644 --- a/src/gui/ExecutingFrame.java +++ b/src/gui/ExecutingFrame.java @@ -1,12 +1,12 @@ /******************************************************************************* - * Copyright (c) 2014 Verena Käfer. + * Copyright (c) 2014 Verena Käfer. * All rights reserved. This program and the accompanying materials * are made available under the terms of the GNU General Public License v3.0 * which accompanies this distribution, and is available at * http://www.gnu.org/copyleft/gpl.html * * Contributors: - * Verena Käfer - initial version + * Verena Käfer - initial version *******************************************************************************/ package gui; @@ -108,7 +108,7 @@ public void showFrame(Matcher matcher, String endingOption, int rounds, } } catch (InterruptedException | ExecutionException e) { JOptionPane.showMessageDialog(null, - "Fehler bei der Ausführung.", "Fehler", + "Fehler bei der Ausführung.", "Fehler", JOptionPane.ERROR_MESSAGE); e.printStackTrace(); } @@ -157,7 +157,7 @@ else if (endingOption.equals("feste Zeit")) { } } catch (InterruptedException | ExecutionException e) { JOptionPane.showMessageDialog(null, - "Fehler bei der Ausführung.", "Fehler", + "Fehler bei der Ausführung.", "Fehler", JOptionPane.ERROR_MESSAGE); e.printStackTrace(); } @@ -209,7 +209,7 @@ public void actionPerformed(ActionEvent arg0) { } } catch (InterruptedException | ExecutionException e) { JOptionPane.showMessageDialog(null, - "Fehler bei der Ausführung.", "Fehler", + "Fehler bei der Ausführung.", "Fehler", JOptionPane.ERROR_MESSAGE); e.printStackTrace(); } @@ -239,7 +239,7 @@ private void showSolutionFrame(final Matcher matcher) { solutionFrame.setLayout(new GridLayout(2, 1)); JLabel optionLabel = new JLabel( - "Es wurde eine Lösung gefunden. Sie haben folgende Möglichkeiten: "); + "Es wurde eine Lösung gefunden. Sie haben folgende Möglichkeiten: "); solutionFrame.add(optionLabel); JPanel optionPanel = new JPanel(); @@ -346,21 +346,21 @@ private void showNoSolutionFrame() { JLabel textLabel = new JLabel(); noSolutionFrame.add(textLabel); - textLabel.setText("Konnte keine Lösung finden. Möglich Optionen: "); + textLabel.setText("Konnte keine Lösung finden. Möglich Optionen: "); JLabel lineOneLabel = new JLabel(); noSolutionFrame.add(lineOneLabel); - lineOneLabel.setText("- Bieten Sie mehr Slots/Räume an "); + lineOneLabel.setText("- Bieten Sie mehr Slots/Räume an "); JLabel lineTwoLabel = new JLabel(); noSolutionFrame.add(lineTwoLabel); lineTwoLabel - .setText("- Ändern Sie die Einstellungen zu Notar oder Moderator"); + .setText("- Ändern Sie die Einstellungen zu Notar oder Moderator"); JLabel lineThreeLabel = new JLabel(); noSolutionFrame.add(lineThreeLabel); lineThreeLabel - .setText("- Führen Sie die Berechnung erneut mit mehr Wiederholungen durch"); + .setText("- FÜhren Sie die Berechnung erneut mit mehr Wiederholungen durch"); JPanel optionPanel = new JPanel(); optionPanel.setLayout(new GridLayout(1, 2)); diff --git a/src/gui/Gui.java b/src/gui/Gui.java index b6d6982..7c9a00e 100644 --- a/src/gui/Gui.java +++ b/src/gui/Gui.java @@ -1,12 +1,12 @@ /******************************************************************************* - * Copyright (c) 2014 Verena Käfer. + * Copyright (c) 2014 Verena Käfer. * All rights reserved. This program and the accompanying materials * are made available under the terms of the GNU General Public License v3.0 * which accompanies this distribution, and is available at * http://www.gnu.org/copyleft/gpl.html * * Contributors: - * Verena Käfer - initial version + * Verena Käfer - initial version *******************************************************************************/ package gui; @@ -94,7 +94,7 @@ private Gui() { public void windowClosing(WindowEvent evt) { if (!Main.isSaved()) { int showConfirmDialog = JOptionPane.showConfirmDialog(null, - "Möchten Sie speichern?"); + "Möchten Sie speichern?"); if (showConfirmDialog == JOptionPane.YES_OPTION) { LoadSave.save(); } @@ -230,7 +230,7 @@ public void actionPerformed(ActionEvent arg0) { participantButtonPanle.add(participantAddButton, gbc_participantAddButton); - participantAddButton.setText("Hinzufügen"); + participantAddButton.setText("HinzufÜgen"); JButton participantEditButton = new JButton(new EditParticipantAction(this)); GridBagConstraints gbc_participantEditButton = new GridBagConstraints(); @@ -254,9 +254,9 @@ public void actionPerformed(ActionEvent arg0) { participantButtonPanle.add(participantDeleteButton, gbc_participantDeleteButton); - participantDeleteButton.setText("Löschen"); + participantDeleteButton.setText("Löschen"); - JButton clearButton = new JButton("Alle Löschen"); + JButton clearButton = new JButton("Alle Löschen"); GridBagConstraints gbc_clearButton = new GridBagConstraints(); gbc_clearButton.fill = GridBagConstraints.BOTH; gbc_clearButton.insets = new Insets(0, 0, 5, 0); @@ -382,7 +382,7 @@ public void actionPerformed(ActionEvent e) { roomButtonPanel.add(roomEditButton, gbc_roomEditButton); JButton deleteButton = new JButton(new deleteInTreeAction()); - deleteButton.setText("Löschen"); + deleteButton.setText("Löschen"); GridBagConstraints gbc_deleteButton = new GridBagConstraints(); gbc_deleteButton.insets = new Insets(0, 0, 0, 5); gbc_deleteButton.fill = GridBagConstraints.HORIZONTAL; @@ -390,7 +390,7 @@ public void actionPerformed(ActionEvent e) { gbc_deleteButton.gridy = 2; roomButtonPanel.add(deleteButton, gbc_deleteButton); - JButton treeDeleteButton = new JButton("Baum löschen"); + JButton treeDeleteButton = new JButton("Baum löschen"); GridBagConstraints gbc_treeDeleteButton = new GridBagConstraints(); gbc_treeDeleteButton.fill = GridBagConstraints.BOTH; gbc_treeDeleteButton.gridx = 1; @@ -456,7 +456,7 @@ public void actionPerformed(ActionEvent arg0) { gbc_exitOptionLabel.gridy = 4; optionPanel.add(exitOptionLabel, gbc_exitOptionLabel); - final JLabel amountRoundsLabel = new JLabel(" Anzahl Ausführungen:"); + final JLabel amountRoundsLabel = new JLabel(" Anzahl Ausführungen:"); GridBagConstraints gbc_amountRoundsLabel = new GridBagConstraints(); gbc_amountRoundsLabel.fill = GridBagConstraints.BOTH; gbc_amountRoundsLabel.insets = new Insets(0, 0, 5, 5); @@ -696,7 +696,7 @@ private boolean checkOptions() { } catch (NumberFormatException nfe) { JOptionPane.showMessageDialog(null, - "Gewählte Zeit muss eine Zahl sein!", "Zeit Error", + "Gewählte Zeit muss eine Zahl sein!", "Zeit Error", JOptionPane.ERROR_MESSAGE); return false; } diff --git a/src/gui/NewRoomGui.java b/src/gui/NewRoomGui.java index 9a463c6..7ab3592 100644 --- a/src/gui/NewRoomGui.java +++ b/src/gui/NewRoomGui.java @@ -1,12 +1,12 @@ /******************************************************************************* - * Copyright (c) 2014 Verena Käfer. + * Copyright (c) 2014 Verena Käfer. * All rights reserved. This program and the accompanying materials * are made available under the terms of the GNU General Public License v3.0 * which accompanies this distribution, and is available at * http://www.gnu.org/copyleft/gpl.html * * Contributors: - * Verena Käfer - initial version + * Verena Käfer - initial version *******************************************************************************/ package gui; @@ -53,7 +53,7 @@ public static void addRoom(JFrame parent) { else if (selectedNode.isRoot()) { JOptionPane.showMessageDialog(null, - "Kann keine Räume zur Wurzel hinzufügen", "Error", + "Kann keine Räume zur Wurzel hinzufügen", "Error", JOptionPane.ERROR_MESSAGE); } @@ -156,7 +156,7 @@ public void actionPerformed(ActionEvent arg0) { roomFrame.pack(); } else { JOptionPane.showMessageDialog(null, - "Kann keine Räume zu Räumen hinzufügen", "Error", + "Kann keine Räume zu Räumen hinzufügen", "Error", JOptionPane.ERROR_MESSAGE); } diff --git a/src/gui/NewSlotGui.java b/src/gui/NewSlotGui.java index 37c8259..649479f 100644 --- a/src/gui/NewSlotGui.java +++ b/src/gui/NewSlotGui.java @@ -1,12 +1,12 @@ /******************************************************************************* - * Copyright (c) 2014 Verena Käfer. + * Copyright (c) 2014 Verena Käfer. * All rights reserved. This program and the accompanying materials * are made available under the terms of the GNU General Public License v3.0 * which accompanies this distribution, and is available at * http://www.gnu.org/copyleft/gpl.html * * Contributors: - * Verena Käfer - initial version + * Verena Käfer - initial version *******************************************************************************/ package gui; diff --git a/src/gui/actions/AddParticipantAction.java b/src/gui/actions/AddParticipantAction.java index 3aaf8e0..a3dc7fd 100644 --- a/src/gui/actions/AddParticipantAction.java +++ b/src/gui/actions/AddParticipantAction.java @@ -1,12 +1,12 @@ /******************************************************************************* - * Copyright (c) 2014 Verena Käfer. + * Copyright (c) 2014 Verena Käfer. * All rights reserved. This program and the accompanying materials * are made available under the terms of the GNU General Public License v3.0 * which accompanies this distribution, and is available at * http://www.gnu.org/copyleft/gpl.html * * Contributors: - * Verena Käfer - initial version + * Verena Käfer - initial version *******************************************************************************/ package gui.actions; diff --git a/src/gui/actions/DeleteParticipantAction.java b/src/gui/actions/DeleteParticipantAction.java index 0476c32..b8babbc 100644 --- a/src/gui/actions/DeleteParticipantAction.java +++ b/src/gui/actions/DeleteParticipantAction.java @@ -1,12 +1,12 @@ /******************************************************************************* - * Copyright (c) 2014 Verena Käfer. + * Copyright (c) 2014 Verena Käfer. * All rights reserved. This program and the accompanying materials * are made available under the terms of the GNU General Public License v3.0 * which accompanies this distribution, and is available at * http://www.gnu.org/copyleft/gpl.html * * Contributors: - * Verena Käfer - initial version + * Verena Käfer - initial version *******************************************************************************/ package gui.actions; diff --git a/src/gui/actions/EditParticipantAction.java b/src/gui/actions/EditParticipantAction.java index 572c15e..5492fdc 100644 --- a/src/gui/actions/EditParticipantAction.java +++ b/src/gui/actions/EditParticipantAction.java @@ -1,12 +1,12 @@ /******************************************************************************* - * Copyright (c) 2014 Verena Käfer. + * Copyright (c) 2014 Verena Käfer. * All rights reserved. This program and the accompanying materials * are made available under the terms of the GNU General Public License v3.0 * which accompanies this distribution, and is available at * http://www.gnu.org/copyleft/gpl.html * * Contributors: - * Verena Käfer - initial version + * Verena Käfer - initial version *******************************************************************************/ package gui.actions; @@ -56,7 +56,7 @@ public void actionPerformed(ActionEvent arg0) { if (rows.length > 1) { JOptionPane.showMessageDialog(null, - "Es kann nur ein Teilnehmer gleichzeitig geändert werden"); + "Es kann nur ein Teilnehmer gleichzeitig geändert werden"); } else { final Participant selectedParticipant = model diff --git a/src/gui/actions/EditRoomAction.java b/src/gui/actions/EditRoomAction.java index f12483b..f0f356a 100644 --- a/src/gui/actions/EditRoomAction.java +++ b/src/gui/actions/EditRoomAction.java @@ -1,12 +1,12 @@ /******************************************************************************* - * Copyright (c) 2014 Verena Käfer. + * Copyright (c) 2014 Verena Käfer. * All rights reserved. This program and the accompanying materials * are made available under the terms of the GNU General Public License v3.0 * which accompanies this distribution, and is available at * http://www.gnu.org/copyleft/gpl.html * * Contributors: - * Verena Käfer - initial version + * Verena Käfer - initial version *******************************************************************************/ package gui.actions; diff --git a/src/gui/actions/EditSlotAction.java b/src/gui/actions/EditSlotAction.java index 055e235..c8e4cfd 100644 --- a/src/gui/actions/EditSlotAction.java +++ b/src/gui/actions/EditSlotAction.java @@ -1,12 +1,12 @@ /******************************************************************************* - * Copyright (c) 2014 Verena Käfer. + * Copyright (c) 2014 Verena Käfer. * All rights reserved. This program and the accompanying materials * are made available under the terms of the GNU General Public License v3.0 * which accompanies this distribution, and is available at * http://www.gnu.org/copyleft/gpl.html * * Contributors: - * Verena Käfer - initial version + * Verena Käfer - initial version *******************************************************************************/ package gui.actions; diff --git a/src/gui/actions/ReadParticipantsAction.java b/src/gui/actions/ReadParticipantsAction.java index 3e4cf26..f2607e8 100644 --- a/src/gui/actions/ReadParticipantsAction.java +++ b/src/gui/actions/ReadParticipantsAction.java @@ -1,12 +1,12 @@ /******************************************************************************* - * Copyright (c) 2014 Verena Käfer. + * Copyright (c) 2014 Verena Käfer. * All rights reserved. This program and the accompanying materials * are made available under the terms of the GNU General Public License v3.0 * which accompanies this distribution, and is available at * http://www.gnu.org/copyleft/gpl.html * * Contributors: - * Verena Käfer - initial version + * Verena Käfer - initial version *******************************************************************************/ package gui.actions; diff --git a/src/gui/actions/deleteInTreeAction.java b/src/gui/actions/deleteInTreeAction.java index 1b82d9f..b216668 100644 --- a/src/gui/actions/deleteInTreeAction.java +++ b/src/gui/actions/deleteInTreeAction.java @@ -1,12 +1,12 @@ /******************************************************************************* - * Copyright (c) 2014 Verena Käfer. + * Copyright (c) 2014 Verena Käfer. * All rights reserved. This program and the accompanying materials * are made available under the terms of the GNU General Public License v3.0 * which accompanies this distribution, and is available at * http://www.gnu.org/copyleft/gpl.html * * Contributors: - * Verena Käfer - initial version + * Verena Käfer - initial version *******************************************************************************/ package gui.actions; @@ -38,7 +38,7 @@ public void actionPerformed(ActionEvent arg0) { if (selectedNode.isRoot()) { JOptionPane.showMessageDialog(null, - "Die Wurzel kann nicht gelöscht werden"); + "Die Wurzel kann nicht gelöscht werden"); } else { RoomTreeModel.getInstance().removeNodeFromParent(selectedNode); Gui.getRoomTree().updateUI(); diff --git a/src/io/EmailDelivery.java b/src/io/EmailDelivery.java index 765be6d..e3ecbb5 100644 --- a/src/io/EmailDelivery.java +++ b/src/io/EmailDelivery.java @@ -1,12 +1,12 @@ /******************************************************************************* - * Copyright (c) 2014 Verena Käfer. + * Copyright (c) 2014 Verena Käfer. * All rights reserved. This program and the accompanying materials * are made available under the terms of the GNU General Public License v3.0 * which accompanies this distribution, and is available at * http://www.gnu.org/copyleft/gpl.html * * Contributors: - * Verena Käfer - initial version + * Verena Käfer - initial version *******************************************************************************/ package io; @@ -65,7 +65,7 @@ public static void deliverEmail(final ArrayList reviewList) { optionFrame.setLayout(new GridLayout(2, 1)); JLabel optionLabel = new JLabel( - "Bitte wählen Sie ein Textdokument, das den Inhalt der e-Mail enthält"); + "Bitte wählen Sie ein Textdokument, das den Inhalt der e-Mail enthält"); optionFrame.add(optionLabel); JButton browseButton = new JButton("Browse"); @@ -117,8 +117,8 @@ private void showTextFrame(JFileChooser fileChooser) { ENCODING.name()); } catch (IOException io) { JOptionPane.showMessageDialog(null, - "Fehler beim Öffnen der Datei", - "Öffnen fehlgeschlagen", JOptionPane.ERROR_MESSAGE); + "Fehler beim Öffnen der Datei", + "Öffnen fehlgeschlagen", JOptionPane.ERROR_MESSAGE); } catch (IllegalArgumentException iae) { JOptionPane.showMessageDialog(null, "Encoding falsch", "Einlesen fehlgeschlagen", @@ -144,7 +144,7 @@ private void showTextFrame(JFileChooser fileChooser) { textFrame.add(buttonPanel); buttonPanel.setLayout(new GridLayout(1, 2)); - JButton backButton = new JButton("Zurück"); + JButton backButton = new JButton("Zurück"); buttonPanel.add(backButton); backButton.addActionListener(new AbstractAction() { @@ -197,7 +197,7 @@ private static void showGreetingFrame() { greetingFrame.setLayout(new GridLayout(5, 1)); JLabel greetingLabel = new JLabel( - "Bitte geben Sie eine Grußformel ein:"); + "Bitte geben Sie eine Grußformel ein:"); greetingFrame.add(greetingLabel); final JTextField greetingField = new JTextField(); @@ -251,9 +251,9 @@ private static void sendMails(final String greeting, final String name) { delayFrame.setLayout(new GridLayout(4, 1)); JLabel delayLabel1 = new JLabel( - "Bei zu schnellem Öffnen der E-Mails kann es zu Prolemen mit dem E-Mail-Programm kommen."); + "Bei zu schnellem Öffnen der E-Mails kann es zu Prolemen mit dem E-Mail-Programm kommen."); JLabel delayLabel2 = new JLabel( - "Bitte geben Sie die Verzögerung zwischen den einzelnen E-Mails in Millisekunden ein:"); + "Bitte geben Sie die Verzögerung zwischen den einzelnen E-Mails in Millisekunden ein:"); delayFrame.add(delayLabel1); delayFrame.add(delayLabel2); @@ -278,11 +278,11 @@ public void actionPerformed(ActionEvent arg0) { delay = Integer.parseInt(delayField.getText()); } catch (NumberFormatException e) { JOptionPane.showMessageDialog(null, - "Verzögerung muss eine Zahl sein"); + "Verzögerung muss eine Zahl sein"); } if (delay < 0) { JOptionPane.showMessageDialog(null, - "Verzögerung muss eine Zahl > 0 sein"); + "Verzögerung muss eine Zahl > 0 sein"); } else { // Send mails Desktop desktop; @@ -389,7 +389,7 @@ public void actionPerformed(ActionEvent arg0) { } else { JOptionPane.showMessageDialog(null, - "Konnte kein E-Mail-Prgramm öffnen"); + "Konnte kein E-Mail-Prgramm Öffnen"); optionFrame.setVisible(true); } } @@ -490,8 +490,8 @@ private static boolean loadReview(JFileChooser fileChooser) { scanner = new Scanner(fileChooser.getSelectedFile(), ENCODING.name()); } catch (IOException io) { - JOptionPane.showMessageDialog(null, "Fehler beim Öffnen der Datei", - "Öffnen fehlgeschlagen", JOptionPane.ERROR_MESSAGE); + JOptionPane.showMessageDialog(null, "Fehler beim Öffnen der Datei", + "Öffnen fehlgeschlagen", JOptionPane.ERROR_MESSAGE); error = true; } catch (IllegalArgumentException iae) { JOptionPane.showMessageDialog(null, "Encoding falsch", diff --git a/src/io/FileProcessor.java b/src/io/FileProcessor.java index 8eef09f..337ba03 100644 --- a/src/io/FileProcessor.java +++ b/src/io/FileProcessor.java @@ -1,12 +1,12 @@ /******************************************************************************* - * Copyright (c) 2014 Verena Käfer. + * Copyright (c) 2014 Verena Käfer. * All rights reserved. This program and the accompanying materials * are made available under the terms of the GNU General Public License v3.0 * which accompanies this distribution, and is available at * http://www.gnu.org/copyleft/gpl.html * * Contributors: - * Verena Käfer - initial version + * Verena Käfer - initial version *******************************************************************************/ package io; @@ -57,8 +57,8 @@ public final void processLineByLine() { try { scanner = new Scanner(filePath, ENCODING.name()); } catch (IOException io) { - JOptionPane.showMessageDialog(null, "Fehler beim Öffnen der Datei", - "Öffnen fehlgeschlagen", JOptionPane.ERROR_MESSAGE); + JOptionPane.showMessageDialog(null, "Fehler beim Öffnen der Datei", + "Öffnen fehlgeschlagen", JOptionPane.ERROR_MESSAGE); } catch (IllegalArgumentException iae) { JOptionPane.showMessageDialog(null, "Encoding falsch", "Einlesen fehlgeschlagen", JOptionPane.ERROR_MESSAGE); @@ -165,7 +165,7 @@ public void printResult(ArrayList reviews, String path) { writer.append((char) Character.LINE_SEPARATOR); if (!r.getAssignedRoom().hasBeamer()) { - writer.append("Beamer benötigt"); + writer.append("Beamer benötigt"); writer.append((char) Character.LINE_SEPARATOR); } diff --git a/src/io/IODialog.java b/src/io/IODialog.java index 3d66e24..3d90a0d 100644 --- a/src/io/IODialog.java +++ b/src/io/IODialog.java @@ -1,12 +1,12 @@ /******************************************************************************* - * Copyright (c) 2014 Verena Käfer. + * Copyright (c) 2014 Verena Käfer. * All rights reserved. This program and the accompanying materials * are made available under the terms of the GNU General Public License v3.0 * which accompanies this distribution, and is available at * http://www.gnu.org/copyleft/gpl.html * * Contributors: - * Verena Käfer - initial version + * Verena Käfer - initial version *******************************************************************************/ package io; @@ -46,7 +46,7 @@ public static File showSaveDialog(String ending, boolean save) { result = JOptionPane .showOptionDialog( null, - "Die Datei existiert bereits. Möchten Sie überschreiben?", + "Die Datei existiert bereits. Möchten Sie überschreiben?", "Warnung", JOptionPane.YES_NO_OPTION, JOptionPane.INFORMATION_MESSAGE, null, null, null); @@ -54,7 +54,7 @@ public static File showSaveDialog(String ending, boolean save) { result = JOptionPane .showOptionDialog( null, - "Die Datei existiert bereits. Möchten Sie überschreiben? Vorsicht: Es wird auch die Latex-Datei mit überschrieben!", + "Die Datei existiert bereits. Möchten Sie überschreiben? Vorsicht: Es wird auch die Latex-Datei mit überschrieben!", "Warnung", JOptionPane.YES_NO_OPTION, JOptionPane.INFORMATION_MESSAGE, null, null, null); diff --git a/src/io/LoadSave.java b/src/io/LoadSave.java index f2f63ce..5d13c45 100644 --- a/src/io/LoadSave.java +++ b/src/io/LoadSave.java @@ -1,12 +1,12 @@ /******************************************************************************* - * Copyright (c) 2014 Verena Käfer. + * Copyright (c) 2014 Verena Käfer. * All rights reserved. This program and the accompanying materials * are made available under the terms of the GNU General Public License v3.0 * which accompanies this distribution, and is available at * http://www.gnu.org/copyleft/gpl.html * * Contributors: - * Verena Käfer - initial version + * Verena Käfer - initial version *******************************************************************************/ package io; @@ -198,7 +198,7 @@ public static void load() { // current game must be saved int saveResult = JOptionPane.showOptionDialog(null, - "Möchten Sie vorher speichern?", "Speichern?", + "Möchten Sie vorher speichern?", "Speichern?", JOptionPane.YES_NO_OPTION, JOptionPane.INFORMATION_MESSAGE, null, null, null); if (saveResult == JOptionPane.YES_OPTION) { diff --git a/src/io/OgerDialogFilter.java b/src/io/OgerDialogFilter.java index 57f66d6..b22e9e8 100644 --- a/src/io/OgerDialogFilter.java +++ b/src/io/OgerDialogFilter.java @@ -1,12 +1,12 @@ /******************************************************************************* - * Copyright (c) 2014 Verena Käfer. + * Copyright (c) 2014 Verena Käfer. * All rights reserved. This program and the accompanying materials * are made available under the terms of the GNU General Public License v3.0 * which accompanies this distribution, and is available at * http://www.gnu.org/copyleft/gpl.html * * Contributors: - * Verena Käfer - initial version + * Verena Käfer - initial version *******************************************************************************/ package io; diff --git a/src/io/TableOutputter.java b/src/io/TableOutputter.java index d9beebe..e678a58 100644 --- a/src/io/TableOutputter.java +++ b/src/io/TableOutputter.java @@ -1,12 +1,12 @@ /******************************************************************************* - * Copyright (c) 2014 Verena Käfer. + * Copyright (c) 2014 Verena Käfer. * All rights reserved. This program and the accompanying materials * are made available under the terms of the GNU General Public License v3.0 * which accompanies this distribution, and is available at * http://www.gnu.org/copyleft/gpl.html * * Contributors: - * Verena Käfer - initial version + * Verena Käfer - initial version *******************************************************************************/ package io; @@ -134,7 +134,7 @@ public static void createTable(String pathToFile, result = result + end + " Uhr & Review: "; // review letters - for (int i = 0; i < array.length + 1; i++) { + for (int i = 0; i < array.length ; i++) { if (array[slotCounter][i] == null) { result = result + "& - "; } else { diff --git a/src/io/TxtDialogFilter.java b/src/io/TxtDialogFilter.java index 06a04c0..015f1de 100644 --- a/src/io/TxtDialogFilter.java +++ b/src/io/TxtDialogFilter.java @@ -1,12 +1,12 @@ /******************************************************************************* - * Copyright (c) 2014 Verena Käfer. + * Copyright (c) 2014 Verena Käfer. * All rights reserved. This program and the accompanying materials * are made available under the terms of the GNU General Public License v3.0 * which accompanies this distribution, and is available at * http://www.gnu.org/copyleft/gpl.html * * Contributors: - * Verena Käfer - initial version + * Verena Käfer - initial version *******************************************************************************/ package io; diff --git a/src/logic/Matcher.java b/src/logic/Matcher.java index 68ef348..7c54b3a 100644 --- a/src/logic/Matcher.java +++ b/src/logic/Matcher.java @@ -1,12 +1,12 @@ /******************************************************************************* - * Copyright (c) 2014 Verena Käfer. + * Copyright (c) 2014 Verena Käfer. * All rights reserved. This program and the accompanying materials * are made available under the terms of the GNU General Public License v3.0 * which accompanies this distribution, and is available at * http://www.gnu.org/copyleft/gpl.html * * Contributors: - * Verena Käfer - initial version + * Verena Käfer - initial version *******************************************************************************/ package logic; diff --git a/src/logic/Pool.java b/src/logic/Pool.java index 56b2a03..f944eb5 100644 --- a/src/logic/Pool.java +++ b/src/logic/Pool.java @@ -1,12 +1,12 @@ /******************************************************************************* - * Copyright (c) 2014 Verena Käfer. + * Copyright (c) 2014 Verena Käfer. * All rights reserved. This program and the accompanying materials * are made available under the terms of the GNU General Public License v3.0 * which accompanies this distribution, and is available at * http://www.gnu.org/copyleft/gpl.html * * Contributors: - * Verena Käfer - initial version + * Verena Käfer - initial version *******************************************************************************/ package logic; diff --git a/src/logic/RandomFunctions.java b/src/logic/RandomFunctions.java index a763091..e859a33 100644 --- a/src/logic/RandomFunctions.java +++ b/src/logic/RandomFunctions.java @@ -1,12 +1,12 @@ /******************************************************************************* - * Copyright (c) 2014 Verena Käfer. + * Copyright (c) 2014 Verena Käfer. * All rights reserved. This program and the accompanying materials * are made available under the terms of the GNU General Public License v3.0 * which accompanies this distribution, and is available at * http://www.gnu.org/copyleft/gpl.html * * Contributors: - * Verena Käfer - initial version + * Verena Käfer - initial version *******************************************************************************/ package logic; diff --git a/src/main/Main.java b/src/main/Main.java index a5d4bf1..d4521cc 100644 --- a/src/main/Main.java +++ b/src/main/Main.java @@ -1,12 +1,12 @@ /******************************************************************************* - * Copyright (c) 2014 Verena Käfer. + * Copyright (c) 2014 Verena Käfer. * All rights reserved. This program and the accompanying materials * are made available under the terms of the GNU General Public License v3.0 * which accompanies this distribution, and is available at * http://www.gnu.org/copyleft/gpl.html * * Contributors: - * Verena Käfer - initial version + * Verena Käfer - initial version *******************************************************************************/ package main; diff --git a/test/MatcherTest.java b/test/MatcherTest.java index ffab084..17efea4 100644 --- a/test/MatcherTest.java +++ b/test/MatcherTest.java @@ -1,12 +1,12 @@ /******************************************************************************* - * Copyright (c) 2014 Verena Käfer. + * Copyright (c) 2014 Verena Käfer. * All rights reserved. This program and the accompanying materials * are made available under the terms of the GNU General Public License v3.0 * which accompanies this distribution, and is available at * http://www.gnu.org/copyleft/gpl.html * * Contributors: - * Verena Käfer - initial version + * Verena Käfer - initial version *******************************************************************************/ import static org.junit.Assert.*; @@ -221,7 +221,7 @@ public static boolean load() { Date endTime = null; try { - date = dateFormat.parse(slotElement.getAttributeValue("Datum")); + date = dateFormat.parse(slotElement.getAttributeValue("Date")); } catch (ParseException e) { JOptionPane.showMessageDialog(null, "Konnte Slot-Datum nicht parsen", @@ -231,7 +231,7 @@ public static boolean load() { try { beginTime = timeFormat.parse(slotElement - .getAttributeValue("Beginn")); + .getAttributeValue("Begin")); } catch (ParseException e) { JOptionPane.showMessageDialog(null, "Konnte Slot-Angfangszeit nicht parsen", @@ -241,7 +241,7 @@ public static boolean load() { try { endTime = timeFormat.parse(slotElement - .getAttributeValue("Ende")); + .getAttributeValue("End")); } catch (ParseException e) { JOptionPane.showMessageDialog(null, "Konnte Slot-Endzeit nicht parsen", @@ -257,8 +257,8 @@ public static boolean load() { .add(newSlotNode); // Rooms - Element roomsElement = slotElement.getChild("AlleRäume"); - for (Element roomElement : roomsElement.getChildren("Raum")) { + Element roomsElement = slotElement.getChild("AllRooms"); + for (Element roomElement : roomsElement.getChildren("Room")) { parseFailed = false; String roomString = roomElement.getAttributeValue("ID"); @@ -281,7 +281,7 @@ public static boolean load() { try { roomBeginTime = timeFormat.parse(roomElement - .getAttributeValue("Beginn")); + .getAttributeValue("Begin")); } catch (ParseException e) { JOptionPane.showMessageDialog(null, "Konnte Slot-Angfangszeit nicht parsen", @@ -292,7 +292,7 @@ public static boolean load() { try { roomEndTime = timeFormat.parse(roomElement - .getAttributeValue("Ende")); + .getAttributeValue("End")); } catch (ParseException e) { JOptionPane.showMessageDialog(null, "Konnte Slot-Endzeit nicht parsen",