diff --git a/src/main/java/de/nanoleaf/tools/panelconfig/PanelConfigBean.java b/src/main/java/de/nanoleaf/tools/panelconfig/PanelConfigBean.java index d327417..ef7a4a2 100644 --- a/src/main/java/de/nanoleaf/tools/panelconfig/PanelConfigBean.java +++ b/src/main/java/de/nanoleaf/tools/panelconfig/PanelConfigBean.java @@ -22,16 +22,44 @@ import de.examples.components.DragDropPaneBean.PaneRepeat; import de.nanoleaf.server.ColorEnum; import de.nanoleaf.server.NanoleafDeviceServer; import de.tvo.tools.StringUtil; +import de.tvo.workplace.DefaultPageBean; import io.github.rowak.nanoleafapi.Panel; import io.github.rowak.nanoleafapi.ShapeType; @CCGenClass (expressionBase="#{d.PanelConfigBean}") -public class PanelConfigBean extends PageBean implements Serializable { +public class PanelConfigBean extends DefaultPageBean implements Serializable { + public void onSave(org.eclnt.jsfserver.base.faces.event.ActionEvent event) { + + } + + public void onLoad(org.eclnt.jsfserver.base.faces.event.ActionEvent event) { + + } + + public void onReset(org.eclnt.jsfserver.base.faces.event.ActionEvent event) { + clearAll(); + } + + public void onLayoutFile(org.eclnt.jsfserver.base.faces.event.ActionEvent event) { + + } + + private void clearAll() { + + } + + ValidValuesBinding m_layoutFileVV = new ValidValuesBinding(); + public ValidValuesBinding getLayoutFileVV() { return m_layoutFileVV; } + + String m_layoutFile; + public String getLayoutFile() { return m_layoutFile; } + public void setLayoutFile(String value) { this.m_layoutFile = value; } + public void onCheckZurodnung(org.eclnt.jsfserver.base.faces.event.ActionEvent event) { if (getColor() == null || getColor().equals("#000000") || getColor().equals(getDefaultPanelColor())) { - OKPopup.createInstance("Start Zuordnung Farbe", "Bitte wählen Sie eine Farbe für die Zuordnung der Panels."); + OKPopup.createInstance("Start Zuordnung Farbe", "Bitte w�hlen Sie eine Farbe f�r die Zuordnung der Panels."); m_startZuordnung = false; return; } else { @@ -40,6 +68,10 @@ public class PanelConfigBean extends PageBean implements Serializable { } } + public String getLiteral(String key) { + return getLiteral("Nanoleaf", key); + } + private void selectNextPanel() { if (getPanelInfoListSource().size() > 0) { getPanelInfoListSource().get(0).setColor(getColor()); @@ -323,7 +355,7 @@ public class PanelConfigBean extends PageBean implements Serializable { anzahlPanelMatrix = matrixX * matrixY; if (getAnzahlPanels() > anzahlPanelMatrix) { - OKPopup.createInstance("Matrix", "Bitte vergrößern Sie die Matrix."); + OKPopup.createInstance("Matrix", "Bitte vergr��ern Sie die Matrix."); return; } @@ -512,7 +544,9 @@ public class PanelConfigBean extends PageBean implements Serializable { } - public class PanelInfo { + public class PanelInfo { + + String i_reference; public String getReference() { return i_reference; } public void setReference(String value) { this.i_reference = value; } diff --git a/src/main/java/de/tvo/workplace/DefaultPageBean.java b/src/main/java/de/tvo/workplace/DefaultPageBean.java new file mode 100644 index 0000000..ccdbde3 --- /dev/null +++ b/src/main/java/de/tvo/workplace/DefaultPageBean.java @@ -0,0 +1,50 @@ +package de.tvo.workplace; + +import org.eclnt.jsfserver.pagebean.PageBean; +import org.eclnt.jsfserver.resources.ResourceManager; + +public class DefaultPageBean extends PageBean { + + public DefaultPageBean() { + // TODO Auto-generated constructor stub + } + + public String getLiteral(String module, String key) { + String ausgabe = ""; + + try { + if (key == null) + return ""; + + ausgabe = ResourceManager.getRuntimeInstance().readProperty("literals" + module, key.toLowerCase()); + // ausgabe = readProperty("literals" + module, name.toLowerCase()); + // System.out.println("module: " + module + " key: " + key + " ausgabe: " + + // ausgabe); + // System.out.println("Language: " + + // FacesContext.getCurrentInstance().getViewRoot().getLocale()); + + } catch (Exception e) { + ausgabe = key; + } + if (ausgabe.equals("literalstable is not defined")) + ausgabe = key; + + if (ausgabe.startsWith("{literals")) + ausgabe = key; + + return ausgabe; + } + + @Override + public String getPageName() { + // TODO Auto-generated method stub + return null; + } + + @Override + public String getRootExpressionUsedInPage() { + // TODO Auto-generated method stub + return null; + } + +} diff --git a/src/main/resources/nanoleaf/literalsNanoleaf.properties b/src/main/resources/nanoleaf/literalsNanoleaf.properties index 9083e45..c1142f5 100644 --- a/src/main/resources/nanoleaf/literalsNanoleaf.properties +++ b/src/main/resources/nanoleaf/literalsNanoleaf.properties @@ -1,4 +1,3 @@ -#Generated by ResourceBundle Editor (http://essiembre.github.io/eclipse-rbe/) -#Created by org.eclnt.editor.resourceeditor.ResourceEditor -#Fri Aug 18 14:40:38 CEST 2017 - +load=Laden +reset=Zu\u00FCcksetzen +save=Speichern \ No newline at end of file diff --git a/src/main/webapp/nanoleaf/tools/panelconfig/panelconfig.xml b/src/main/webapp/nanoleaf/tools/panelconfig/panelconfig.xml index 0e97d0e..03af055 100644 --- a/src/main/webapp/nanoleaf/tools/panelconfig/panelconfig.xml +++ b/src/main/webapp/nanoleaf/tools/panelconfig/panelconfig.xml @@ -5,8 +5,9 @@ - + + @@ -20,7 +21,7 @@ - + @@ -34,7 +35,7 @@ - + @@ -45,6 +46,15 @@ + + + + + + + + + @@ -75,7 +85,7 @@ - + @@ -88,9 +98,15 @@ + + + + + +