Skip to content

Commit

Permalink
fixed umlaute
Browse files Browse the repository at this point in the history
  • Loading branch information
Verena committed Jun 15, 2015
1 parent 8a9f3d8 commit 6e39509
Show file tree
Hide file tree
Showing 34 changed files with 173 additions and 173 deletions.
122 changes: 61 additions & 61 deletions res-test/reviews.oger
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
<?xml version="1.0" encoding="UTF-8"?>
<root>
<allParticipants>
<participant firstName="Claudia" lastName="Delacruz" mail="[email protected]" group="1" />
Expand All @@ -10,7 +10,7 @@
<participant firstName="Randall" lastName="Rogers" mail="[email protected]" group="3" />
<participant firstName="Hop" lastName="Chandler" mail="[email protected]" group="3" />
<participant firstName="Thaddeus" lastName="Harrington" mail="[email protected]" group="3" />
<participant firstName="Winifred" lastName="Mendez" mail="[email protected]" group="4" />
<participant firstName="Winifred" lastName="MEndz" mail="[email protected]" group="4" />
<participant firstName="Nero" lastName="Gillespie" mail="[email protected]" group="4" />
<participant firstName="Idola" lastName="Bray" mail="[email protected]" group="4" />
<participant firstName="Cameran" lastName="Shelton" mail="[email protected]" group="5" />
Expand Down Expand Up @@ -60,15 +60,15 @@
<participant firstName="Wynter" lastName="Rush" mail="[email protected]" group="19" />
<participant firstName="Buffy" lastName="Gonzalez" mail="[email protected]" group="20" />
<participant firstName="Benedict" lastName="Tate" mail="[email protected]" group="20" />
<participant firstName="Dora" lastName="Mendez" mail="[email protected]" group="20" />
<participant firstName="Dora" lastName="MEndz" mail="[email protected]" group="20" />
<participant firstName="Carter" lastName="Farrell" mail="[email protected]" group="21" />
<participant firstName="Kirby" lastName="Cochran" mail="[email protected]" group="21" />
<participant firstName="Aspen" lastName="Blackburn" mail="[email protected]" group="21" />
<participant firstName="Emily" lastName="Cantu" mail="[email protected]" group="22" />
<participant firstName="Xenos" lastName="Carpenter" mail="[email protected]" group="22" />
<participant firstName="Kelsie" lastName="Sloan" mail="[email protected]" group="22" />
<participant firstName="Andrew" lastName="Bruce" mail="[email protected]" group="23" />
<participant firstName="Willa" lastName="Mendez" mail="[email protected]" group="23" />
<participant firstName="Willa" lastName="MEndz" mail="[email protected]" group="23" />
<participant firstName="Lydia" lastName="Ray" mail="[email protected]" group="23" />
<participant firstName="Baxter" lastName="Cameron" mail="[email protected]" group="24" />
<participant firstName="Azalia" lastName="Merrill" mail="[email protected]" group="24" />
Expand Down Expand Up @@ -111,69 +111,69 @@
<participant firstName="Jaden" lastName="Kemp" mail="[email protected]" group="36" />
</allParticipants>
<Slots>
<Slot Datum="19.11.14" Beginn="19:00" Ende="20:40">
<AlleRäume>
<Raum Beamer="false" ID="1.212" Beginn="19:00" Ende="20:40" />
<Raum Beamer="false" ID="1.014" Beginn="19:00" Ende="20:40" />
<Raum Beamer="false" ID="1.020" Beginn="19:00" Ende="20:40" />
<Raum Beamer="false" ID="1.168" Beginn="19:00" Ende="20:40" />
<Raum Beamer="false" ID="0.463" Beginn="19:00" Ende="20:40" />
<Raum Beamer="false" ID="0.457" Beginn="19:00" Ende="20:40" />
<Raum Beamer="false" ID="0.447" Beginn="19:00" Ende="20:40" />
</AlleRäume>
<Slot Date="19.11.14" Begin="19:00" End="20:40">
<AllRooms>
<Room Beamer="false" ID="1.212" Begin="19:00" End="20:40" />
<Room Beamer="false" ID="1.014" Begin="19:00" End="20:40" />
<Room Beamer="false" ID="1.020" Begin="19:00" End="20:40" />
<Room Beamer="false" ID="1.168" Begin="19:00" End="20:40" />
<Room Beamer="false" ID="0.463" Begin="19:00" End="20:40" />
<Room Beamer="false" ID="0.457" Begin="19:00" End="20:40" />
<Room Beamer="false" ID="0.447" Begin="19:00" End="20:40" />
</AllRooms>
</Slot>
<Slot Datum="20.11.14" Beginn="17:20" Ende="19:00">
<AlleRäume>
<Raum Beamer="false" ID="1.212" Beginn="17:20" Ende="19:00" />
<Raum Beamer="false" ID="1.014" Beginn="17:20" Ende="19:00" />
<Raum Beamer="false" ID="1.020" Beginn="17:20" Ende="19:00" />
<Raum Beamer="false" ID="1.168" Beginn="17:20" Ende="19:00" />
</AlleRäume>
<Slot Date="20.11.14" Begin="17:20" End="19:00">
<AllRooms>
<Room Beamer="false" ID="1.212" Begin="17:20" End="19:00" />
<Room Beamer="false" ID="1.014" Begin="17:20" End="19:00" />
<Room Beamer="false" ID="1.020" Begin="17:20" End="19:00" />
<Room Beamer="false" ID="1.168" Begin="17:20" End="19:00" />
</AllRooms>
</Slot>
<Slot Datum="20.11.14" Beginn="19:00" Ende="20:40">
<AlleRäume>
<Raum Beamer="false" ID="1.212" Beginn="19:00" Ende="20:40" />
<Raum Beamer="false" ID="1.014" Beginn="19:00" Ende="20:40" />
<Raum Beamer="false" ID="1.020" Beginn="19:00" Ende="20:40" />
<Raum Beamer="false" ID="1.168" Beginn="19:00" Ende="20:40" />
<Raum Beamer="false" ID="0.463" Beginn="19:00" Ende="20:40" />
<Raum Beamer="false" ID="0.457" Beginn="19:00" Ende="20:40" />
</AlleRäume>
<Slot Date="20.11.14" Begin="19:00" End="20:40">
<AllRooms>
<Room Beamer="false" ID="1.212" Begin="19:00" End="20:40" />
<Room Beamer="false" ID="1.014" Begin="19:00" End="20:40" />
<Room Beamer="false" ID="1.020" Begin="19:00" End="20:40" />
<Room Beamer="false" ID="1.168" Begin="19:00" End="20:40" />
<Room Beamer="false" ID="0.463" Begin="19:00" End="20:40" />
<Room Beamer="false" ID="0.457" Begin="19:00" End="20:40" />
</AllRooms>
</Slot>
<Slot Datum="21.11.14" Beginn="11:20" Ende="13:00">
<AlleRäume>
<Raum Beamer="false" ID="1.014" Beginn="11:20" Ende="13:00" />
<Raum Beamer="false" ID="1.020" Beginn="11:20" Ende="13:00" />
<Raum Beamer="false" ID="1.168" Beginn="11:20" Ende="13:00" />
</AlleRäume>
<Slot Date="21.11.14" Begin="11:20" End="13:00">
<AllRooms>
<Room Beamer="false" ID="1.014" Begin="11:20" End="13:00" />
<Room Beamer="false" ID="1.020" Begin="11:20" End="13:00" />
<Room Beamer="false" ID="1.168" Begin="11:20" End="13:00" />
</AllRooms>
</Slot>
<Slot Datum="21.11.14" Beginn="15:30" Ende="17:15">
<AlleRäume>
<Raum Beamer="false" ID="1.212" Beginn="15:30" Ende="17:15" />
<Raum Beamer="false" ID="1.014" Beginn="15:30" Ende="17:15" />
<Raum Beamer="false" ID="1.020" Beginn="15:30" Ende="17:15" />
<Raum Beamer="false" ID="1.168" Beginn="15:30" Ende="17:15" />
<Raum Beamer="false" ID="0.463" Beginn="15:30" Ende="17:15" />
</AlleRäume>
<Slot Date="21.11.14" Begin="15:30" End="17:15">
<AllRooms>
<Room Beamer="false" ID="1.212" Begin="15:30" End="17:15" />
<Room Beamer="false" ID="1.014" Begin="15:30" End="17:15" />
<Room Beamer="false" ID="1.020" Begin="15:30" End="17:15" />
<Room Beamer="false" ID="1.168" Begin="15:30" End="17:15" />
<Room Beamer="false" ID="0.463" Begin="15:30" End="17:15" />
</AllRooms>
</Slot>
<Slot Datum="21.11.14" Beginn="19:00" Ende="20:40">
<AlleRäume>
<Raum Beamer="false" ID="1.212" Beginn="19:00" Ende="20:40" />
<Raum Beamer="false" ID="1.014" Beginn="19:00" Ende="20:40" />
<Raum Beamer="false" ID="1.020" Beginn="19:00" Ende="20:40" />
<Raum Beamer="false" ID="1.168" Beginn="19:00" Ende="20:40" />
<Raum Beamer="false" ID="0.463" Beginn="19:00" Ende="20:40" />
<Raum Beamer="false" ID="0.457" Beginn="19:00" Ende="20:40" />
<Raum Beamer="false" ID="0.447" Beginn="19:00" Ende="20:40" />
</AlleRäume>
<Slot Date="21.11.14" Begin="19:00" End="20:40">
<AllRooms>
<Room Beamer="false" ID="1.212" Begin="19:00" End="20:40" />
<Room Beamer="false" ID="1.014" Begin="19:00" End="20:40" />
<Room Beamer="false" ID="1.020" Begin="19:00" End="20:40" />
<Room Beamer="false" ID="1.168" Begin="19:00" End="20:40" />
<Room Beamer="false" ID="0.463" Begin="19:00" End="20:40" />
<Room Beamer="false" ID="0.457" Begin="19:00" End="20:40" />
<Room Beamer="false" ID="0.447" Begin="19:00" End="20:40" />
</AllRooms>
</Slot>
<Slot Datum="22.11.14" Beginn="11:20" Ende="13:00">
<AlleRäume>
<Raum Beamer="false" ID="1.212" Beginn="11:20" Ende="13:00" />
<Raum Beamer="false" ID="1.014" Beginn="11:20" Ende="13:00" />
<Raum Beamer="false" ID="1.020" Beginn="11:20" Ende="13:00" />
<Raum Beamer="false" ID="1.168" Beginn="11:20" Ende="13:00" />
</AlleRäume>
<Slot Date="22.11.14" Begin="11:20" End="13:00">
<AllRooms>
<Room Beamer="false" ID="1.212" Begin="11:20" End="13:00" />
<Room Beamer="false" ID="1.014" Begin="11:20" End="13:00" />
<Room Beamer="false" ID="1.020" Begin="11:20" End="13:00" />
<Room Beamer="false" ID="1.168" Begin="11:20" End="13:00" />
</AllRooms>
</Slot>
</Slots>
</root>
4 changes: 2 additions & 2 deletions src/data/Participant.java
View file
Original file line number Diff line number Diff line change
@@ -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;

Expand Down
4 changes: 2 additions & 2 deletions src/data/ParticipantTableModel.java
View file
Original file line number Diff line number Diff line change
@@ -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;

Expand Down
4 changes: 2 additions & 2 deletions src/data/Review.java
View file
Original file line number Diff line number Diff line change
@@ -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;

Expand Down
4 changes: 2 additions & 2 deletions src/data/ReviewPlan.java
View file
Original file line number Diff line number Diff line change
@@ -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;

Expand Down
4 changes: 2 additions & 2 deletions src/data/Room.java
View file
Original file line number Diff line number Diff line change
@@ -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;

Expand Down
4 changes: 2 additions & 2 deletions src/data/RoomNode.java
View file
Original file line number Diff line number Diff line change
@@ -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;

Expand Down
4 changes: 2 additions & 2 deletions src/data/RoomTreeModel.java
View file
Original file line number Diff line number Diff line change
@@ -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;

Expand Down
4 changes: 2 additions & 2 deletions src/data/Slot.java
View file
Original file line number Diff line number Diff line change
@@ -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;

Expand Down
4 changes: 2 additions & 2 deletions src/data/SlotNode.java
View file
Original file line number Diff line number Diff line change
@@ -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;

Expand Down
4 changes: 2 additions & 2 deletions src/data/SortSlot.java
View file
Original file line number Diff line number Diff line change
@@ -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;

Expand Down
20 changes: 10 additions & 10 deletions src/gui/ExecutingFrame.java
View file
Original file line number Diff line number Diff line change
@@ -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;

Expand Down Expand Up @@ -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();
}
Expand Down Expand Up @@ -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();
}
Expand Down Expand Up @@ -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();
}
Expand Down Expand Up @@ -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();
Expand Down Expand Up @@ -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));
Expand Down
Loading

0 comments on commit 6e39509

Please sign in to comment.