diff --git a/uCC/ucc.frontend/src/main/java/org/universAAL/ucc/windows/AccountWindow.java b/uCC/ucc.frontend/src/main/java/org/universAAL/ucc/windows/AccountWindow.java
index 81488d5a398cd15e6f5750dcf89b77db63892b8b..1ee50af3fd1dc3db46912f3fecefe994d8cc3d41 100644
--- a/uCC/ucc.frontend/src/main/java/org/universAAL/ucc/windows/AccountWindow.java
+++ b/uCC/ucc.frontend/src/main/java/org/universAAL/ucc/windows/AccountWindow.java
@@ -1,5 +1,7 @@
package org.universAAL.ucc.windows;
+import java.util.ResourceBundle;
+
import com.vaadin.ui.Button;
import com.vaadin.ui.CheckBox;
import com.vaadin.ui.HorizontalLayout;
@@ -16,9 +18,13 @@ public class AccountWindow extends Window {
private Button save;
private Button reset;
private CheckBox check;
+ private String base;
+ private ResourceBundle bundle;
public AccountWindow() {
- super("Create new Account");
+ base = "resources.ucc";
+ bundle = ResourceBundle.getBundle(base);
+ setCaption(bundle.getString("create.new.account"));
setWidth("375px");
setHeight("300px");
center();
@@ -26,18 +32,18 @@ public class AccountWindow extends Window {
VerticalLayout vl = new VerticalLayout();
vl.setSizeFull();
vl.setMargin(true);
- user = new TextField("Username:");
- pwd = new PasswordField("Password:");
- confirm = new PasswordField("Confirm Password:");
- check = new CheckBox("Save");
+ user = new TextField(bundle.getString("user.name"));
+ pwd = new PasswordField(bundle.getString("pwd.label"));
+ confirm = new PasswordField(bundle.getString("confirm.pwd"));
+ check = new CheckBox(bundle.getString("save.button"));
vl.addComponent(user);
vl.addComponent(pwd);
vl.addComponent(confirm);
HorizontalLayout hl = new HorizontalLayout();
hl.setMargin(true);
hl.setSpacing(true);
- save = new Button("Save");
- reset = new Button("Reset");
+ save = new Button(bundle.getString("save.button"));
+ reset = new Button(bundle.getString("reset.button"));
hl.addComponent(save);
hl.addComponent(reset);
vl.addComponent(check);
diff --git a/uCC/ucc.frontend/src/main/java/org/universAAL/ucc/windows/AddNewHardwareWindow.java b/uCC/ucc.frontend/src/main/java/org/universAAL/ucc/windows/AddNewHardwareWindow.java
index 6a63e18cb4f1f877d2b7104572c3302a7ff7d6fc..56570926afa64ac10271e950af6679ad1fec2adf 100644
--- a/uCC/ucc.frontend/src/main/java/org/universAAL/ucc/windows/AddNewHardwareWindow.java
+++ b/uCC/ucc.frontend/src/main/java/org/universAAL/ucc/windows/AddNewHardwareWindow.java
@@ -2,6 +2,7 @@ package org.universAAL.ucc.windows;
import java.io.IOException;
import java.text.ParseException;
+import java.util.ResourceBundle;
import javax.xml.bind.JAXBException;
@@ -17,9 +18,13 @@ public class AddNewHardwareWindow extends Window {
private VerticalLayout layout;
private HardwareWindow hWindow;
private String flatId;
+ private String base;
+ private ResourceBundle bundle;
public AddNewHardwareWindow(HardwareWindow win, RoomsWindow rWin, UccUI app) throws JAXBException, IOException, ParseException {
- super("Add new Hardware");
+ base = "resources.ucc";
+ bundle = ResourceBundle.getBundle(base);
+ setCaption(bundle.getString("add.new.hw"));
this.app = app;
this.hWindow = win;
center();
diff --git a/uCC/ucc.frontend/src/main/java/org/universAAL/ucc/windows/AddNewPersonWindow.java b/uCC/ucc.frontend/src/main/java/org/universAAL/ucc/windows/AddNewPersonWindow.java
index 743853d17154bfeb4b6b58e93b4ac0680dedb128..2831de6167e7c30805d676a82fa80a6d8f5aaa71 100644
--- a/uCC/ucc.frontend/src/main/java/org/universAAL/ucc/windows/AddNewPersonWindow.java
+++ b/uCC/ucc.frontend/src/main/java/org/universAAL/ucc/windows/AddNewPersonWindow.java
@@ -2,6 +2,7 @@ package org.universAAL.ucc.windows;
import java.io.IOException;
import java.text.ParseException;
+import java.util.ResourceBundle;
import javax.xml.bind.JAXBException;
@@ -17,9 +18,13 @@ public class AddNewPersonWindow extends Window {
private VerticalLayout layout;
private HumansWindow hWindow;
private String flatId;
+ private String base;
+ private ResourceBundle bundle;
public AddNewPersonWindow(HumansWindow win, UccUI app) throws JAXBException, IOException, ParseException {
- super("Add new Person");
+ base = "resources.ucc";
+ bundle = ResourceBundle.getBundle(base);
+ setCaption(bundle.getString("add.new.person"));
this.app = app;
this.hWindow = win;
center();
diff --git a/uCC/ucc.frontend/src/main/java/org/universAAL/ucc/windows/HardwareWindow.java b/uCC/ucc.frontend/src/main/java/org/universAAL/ucc/windows/HardwareWindow.java
index d62a3b8cc23fd34b29676319d63d8ad70a7f57d2..c33973e4df0fa0d2badeab1db0364cb2aa772599 100644
--- a/uCC/ucc.frontend/src/main/java/org/universAAL/ucc/windows/HardwareWindow.java
+++ b/uCC/ucc.frontend/src/main/java/org/universAAL/ucc/windows/HardwareWindow.java
@@ -3,6 +3,7 @@ package org.universAAL.ucc.windows;
import java.awt.event.WindowEvent;
import java.io.IOException;
import java.text.ParseException;
+import java.util.ResourceBundle;
import javax.xml.bind.JAXBException;
@@ -24,10 +25,14 @@ public class HardwareWindow extends Window implements Window.CloseListener{
private UccUI app;
private String flatId;
private HardwareWindowController hwc;
+ private String base;
+ private ResourceBundle bundle;
public HardwareWindow(UccUI app) throws JAXBException, IOException, ParseException {
//super("Hardware of "+flat);
// this.flatId = flat;
+ base = "resources.ucc";
+ bundle = ResourceBundle.getBundle(base);
this.app = app;
StringBuffer breadcrump = new StringBuffer();
center();
@@ -37,7 +42,7 @@ public class HardwareWindow extends Window implements Window.CloseListener{
if(counter == app.getMainWindow().getChildWindows().size())
breadcrump.append(w.getCaption()+" > ");
}
- breadcrump.append("Hardware");
+ breadcrump.append(bundle.getString("hardware.title"));
setCaption(breadcrump.toString());
setWidth(500, Sizeable.UNITS_PIXELS);
setHeight(365, Sizeable.UNITS_PIXELS);
diff --git a/uCC/ucc.frontend/src/main/java/org/universAAL/ucc/windows/HumansWindow.java b/uCC/ucc.frontend/src/main/java/org/universAAL/ucc/windows/HumansWindow.java
index 965427cd23bdceea20f4c6993f94f8cab2c06720..c2d5c8d3419d43ccead13b92b0d2da4e41d2008e 100644
--- a/uCC/ucc.frontend/src/main/java/org/universAAL/ucc/windows/HumansWindow.java
+++ b/uCC/ucc.frontend/src/main/java/org/universAAL/ucc/windows/HumansWindow.java
@@ -2,6 +2,7 @@ package org.universAAL.ucc.windows;
import java.io.IOException;
import java.text.ParseException;
+import java.util.ResourceBundle;
import javax.xml.bind.JAXBException;
@@ -18,8 +19,12 @@ public class HumansWindow extends Window {
private HorizontalSplitPanel split;
private UccUI app;
private String flatId;
+ private ResourceBundle bundle;
+ private String base;
public HumansWindow(UccUI app) throws JAXBException, IOException, ParseException {
+ base = "resources.ucc";
+ bundle = ResourceBundle.getBundle(base);
StringBuffer breadcrump = new StringBuffer();
int counter = 0;
for(Window w : app.getMainWindow().getChildWindows()) {
@@ -27,7 +32,7 @@ public class HumansWindow extends Window {
if(counter == app.getMainWindow().getChildWindows().size())
breadcrump.append(w.getCaption()+" > ");
}
- breadcrump.append("Persons");
+ breadcrump.append(bundle.getString("persons.title"));
setCaption(breadcrump.toString());
// this.flatId = flat;
this.app = app;
diff --git a/uCC/ucc.frontend/src/main/java/org/universAAL/ucc/windows/RoomsWindow.java b/uCC/ucc.frontend/src/main/java/org/universAAL/ucc/windows/RoomsWindow.java
index 3e713b1fe9236e83a1d23873cf739645773328e3..c783bc2d3407180811cd428387d22165a72e2258 100644
--- a/uCC/ucc.frontend/src/main/java/org/universAAL/ucc/windows/RoomsWindow.java
+++ b/uCC/ucc.frontend/src/main/java/org/universAAL/ucc/windows/RoomsWindow.java
@@ -2,6 +2,7 @@ package org.universAAL.ucc.windows;
import java.io.IOException;
import java.text.ParseException;
+import java.util.ResourceBundle;
import javax.xml.bind.JAXBException;
@@ -26,9 +27,13 @@ public class RoomsWindow extends Window {
private UccUI app;
private String flatId;
private RoomsWindowController rwc;
+ private ResourceBundle bundle;
+ private String base;
public RoomsWindow(/*String flat,*/ UccUI app) throws JAXBException, IOException, ParseException {
//super("Rooms of "+flat);
+ base = "resources.ucc";
+ bundle = ResourceBundle.getBundle(base);
StringBuffer breadcrump = new StringBuffer();
int counter = 0;
for(Window w : app.getMainWindow().getChildWindows()) {
@@ -37,7 +42,7 @@ public class RoomsWindow extends Window {
breadcrump.append(w.getCaption()+" > ");
}
- breadcrump.append("Rooms of with Hardware");
+ breadcrump.append(bundle.getString("rooms.view"));
setCaption(breadcrump.toString());
// this.flatId = flat;
center();
diff --git a/uCC/ucc.frontend/src/main/java/org/universAAL/ucc/windows/TabForm.java b/uCC/ucc.frontend/src/main/java/org/universAAL/ucc/windows/TabForm.java
index 77c59128a11b19abaf335ff8fe4fed03b2e2b87c..66c6d98b9cb71da7904a13cb25b8bc8562a5f70d 100644
--- a/uCC/ucc.frontend/src/main/java/org/universAAL/ucc/windows/TabForm.java
+++ b/uCC/ucc.frontend/src/main/java/org/universAAL/ucc/windows/TabForm.java
@@ -2,6 +2,7 @@ package org.universAAL.ucc.windows;
import java.util.ArrayList;
import java.util.Iterator;
+import java.util.ResourceBundle;
import com.vaadin.ui.Button;
import com.vaadin.ui.Form;
@@ -16,8 +17,12 @@ public class TabForm extends Form{
private Button deleteButton;
private String header;
private String id;
+ private ResourceBundle bundle;
+ private String base;
public TabForm() {
+ base = "resources.ucc";
+ bundle = ResourceBundle.getBundle(base);
setSizeFull();
setImmediate(true);
setWriteThrough(false);
@@ -28,12 +33,12 @@ public class TabForm extends Form{
HorizontalLayout hl = new HorizontalLayout();
hl.setSpacing(true);
hl.setMargin(true);
- saveButton = new Button("Save", this, "commit");
+ saveButton = new Button(bundle.getString("save.button"), this, "commit");
saveButton.setVisible(false);
- resetButton = new Button("Reset", this, "discard");
+ resetButton = new Button(bundle.getString("reset.button"), this, "discard");
resetButton.setVisible(false);
- editButton = new Button("Edit");
- deleteButton = new Button("Delete");
+ editButton = new Button(bundle.getString("edit.button"));
+ deleteButton = new Button(bundle.getString("delete.button"));
hl.addComponent(editButton);
hl.addComponent(saveButton);
//hl.addComponent(resetButton);
diff --git a/uCC/ucc.frontend/src/main/java/resources/ucc_de.properties b/uCC/ucc.frontend/src/main/java/resources/ucc_de.properties
index c66c212fdde970d8f8f38adbfa22147d7fabc588..302ecb123fe1401e7e707a1b2c6f93751183482c 100644
--- a/uCC/ucc.frontend/src/main/java/resources/ucc_de.properties
+++ b/uCC/ucc.frontend/src/main/java/resources/ucc_de.properties
@@ -92,4 +92,13 @@ srv.already.exists=Der AAL Service ist bereits installiert
uninstall.usrv=Deinstallieren
uninstall.button=Deinstalliert einen AAL Service
result.installation=Ergebnis der Installation
-config.usrv=Konfig uSrv
\ No newline at end of file
+config.usrv=Konfig uSrv
+rooms.view=Räume mit Hardware
+delete.button=Löschen
+persons.title=Personen
+hardware.title=Hardware
+add.new.person=Neue Person hinzufügen
+add.new.hw=Neue Hardware hinzufügen
+create.new.account=Neues Konto anlegen
+user.name=Benutzername:
+confirm.pwd=Passwort bestätigen:
\ No newline at end of file
diff --git a/uCC/ucc.frontend/src/main/java/resources/ucc_en.properties b/uCC/ucc.frontend/src/main/java/resources/ucc_en.properties
index c199c0d23ec23527000fdff2f00cba45c647129a..09921f46c25cdd88529eaa07470ae18fd64a43ed 100644
--- a/uCC/ucc.frontend/src/main/java/resources/ucc_en.properties
+++ b/uCC/ucc.frontend/src/main/java/resources/ucc_en.properties
@@ -92,4 +92,13 @@ srv.already.exists=The AAL service is already installed
uninstall.usrv=Uninstall
uninstall.button=Uninstalls a installed AAL service
result.installation=Result of the installation
-config.usrv=Config uSrv
\ No newline at end of file
+config.usrv=Config uSrv
+rooms.view=Rooms with Hardware
+delete.button=Delete
+persons.title=Persons
+hardware.title=Hardware
+add.new.person=Add new person
+add.new.hw=Add new hardware
+create.new.account=Create new account
+user.name=Username:
+confirm.pwd=Confirm password:
\ No newline at end of file