diff --git a/.ccEclipseSynch b/.ccEclipseSynch deleted file mode 100644 index 033a451..0000000 --- a/.ccEclipseSynch +++ /dev/null @@ -1 +0,0 @@ -Src changed \ No newline at end of file diff --git a/.classpath b/.classpath index f3bce31..e68d17e 100644 --- a/.classpath +++ b/.classpath @@ -27,6 +27,7 @@ + diff --git a/.settings/org.eclipse.wst.common.component b/.settings/org.eclipse.wst.common.component index 79c4e85..8c8dc28 100644 --- a/.settings/org.eclipse.wst.common.component +++ b/.settings/org.eclipse.wst.common.component @@ -1,20 +1,28 @@ - + + - + + - + + - + + - + + - - + + - + + - - + + + + diff --git a/pom.xml b/pom.xml index 1cfd457..1af7c46 100644 --- a/pom.xml +++ b/pom.xml @@ -27,7 +27,7 @@ - 20240910 + 20250128 diff --git a/src/main/java/de/games/nanoleaf/panelconfig/MatrixInfo.java b/src/main/java/de/games/nanoleaf/panelconfig/MatrixInfo.java index b2c9af4..4daf985 100644 --- a/src/main/java/de/games/nanoleaf/panelconfig/MatrixInfo.java +++ b/src/main/java/de/games/nanoleaf/panelconfig/MatrixInfo.java @@ -36,6 +36,4 @@ public class MatrixInfo { m_countPanels = countPanels; } - - } diff --git a/src/main/java/de/games/nanoleaf/panelconfig/NanoPANENode.java b/src/main/java/de/games/nanoleaf/panelconfig/NanoPANENode.java new file mode 100644 index 0000000..a5f50b6 --- /dev/null +++ b/src/main/java/de/games/nanoleaf/panelconfig/NanoPANENode.java @@ -0,0 +1,73 @@ +package de.games.nanoleaf.panelconfig; + +import org.eclnt.jsfserver.elements.componentnodes.COLDISTANCENode; +import org.eclnt.jsfserver.elements.componentnodes.LABELNode; +import org.eclnt.jsfserver.elements.componentnodes.PANENode; +import org.eclnt.jsfserver.elements.componentnodes.ROWDISTANCENode; +import org.eclnt.jsfserver.elements.componentnodes.ROWNode; + +public class NanoPANENode extends PANENode { + + private PanelInfo m_panelInfo = null; + + public PanelInfo getPanelInfo() { + return m_panelInfo; + } + + public void setPanelInfo(PanelInfo panelInfo) { + m_panelInfo = panelInfo; + } + + public NanoPANENode(PanelInfo panelInfo) { + this.m_panelInfo = panelInfo; + + createInnerPane(); + } + + private void createInnerPane() { + + this.setDragsend("NANOLEAF:ID_" + getPanelInfo().getPanelID()); + this.setHeight(80); + this.setWidth(80); + this.setBorder("left:2;right:2;top:2;bottom:2;color:#ff0000"); + ROWDISTANCENode rowdistanceNode = new ROWDISTANCENode(); + this.addSubNode(rowdistanceNode); + + ROWNode row = new ROWNode(); + + COLDISTANCENode coldistanceNode = new COLDISTANCENode(); + row.addSubNode(coldistanceNode); + + LABELNode labelPaneID = new LABELNode(); + labelPaneID.setText("ID: " + getPanelInfo().getPanelID()); + + row.addSubNode(labelPaneID); + + this.addSubNode(row); + + row = new ROWNode(); + coldistanceNode = new COLDISTANCENode(); + row.addSubNode(coldistanceNode); + labelPaneID = new LABELNode(); + labelPaneID.setText("Nano ID: "); + + row.addSubNode(labelPaneID); + + this.addSubNode(row); + + row = new ROWNode(); + coldistanceNode = new COLDISTANCENode(); + row.addSubNode(coldistanceNode); + labelPaneID = new LABELNode(); + if (getPanelInfo().getPanelNanoleafID() == null) { + labelPaneID.setText("unbek."); + } else { + labelPaneID.setText(getPanelInfo().getPanelNanoleafID()); + } + + row.addSubNode(labelPaneID); + + this.addSubNode(row); + + } +} diff --git a/src/main/java/de/games/nanoleaf/panelconfig/PanelInfo.java b/src/main/java/de/games/nanoleaf/panelconfig/PanelInfo.java index 1847606..c989ec5 100644 --- a/src/main/java/de/games/nanoleaf/panelconfig/PanelInfo.java +++ b/src/main/java/de/games/nanoleaf/panelconfig/PanelInfo.java @@ -19,8 +19,6 @@ public class PanelInfo { public int getPanelID() { return m_panelID; } - - public void setPanelID(int panelID) { m_panelID = panelID; } @@ -29,8 +27,6 @@ public class PanelInfo { public String getPanelNanoleafID() { return m_panelNanoleafID; } - - public void setPanelNanoleafID(String panelNanoleafID) { m_panelNanoleafID = panelNanoleafID; } @@ -39,8 +35,6 @@ public class PanelInfo { public int getPanelMatrixPosX() { return m_panelMatrixPosX; } - - public void setPanelMatrixPosX(int panelMatrixPosX) { m_panelMatrixPosX = panelMatrixPosX; } @@ -49,8 +43,6 @@ public class PanelInfo { public int getPanelMatrixPosY() { return m_panelMatrixPosY; } - - public void setPanelMatrixPosY(int panelMatrixPosY) { m_panelMatrixPosY = panelMatrixPosY; } @@ -59,8 +51,6 @@ public class PanelInfo { public String getPanelColor() { return m_panelColor; } - - public void setPanelColor(String panelColor) { m_panelColor = panelColor; } @@ -69,8 +59,6 @@ public class PanelInfo { public boolean getPanelActiv() { return m_panelActiv; } - - public void setPanelActiv(boolean panelActiv) { m_panelActiv = panelActiv; } @@ -79,8 +67,6 @@ public class PanelInfo { public boolean getPanelInit() { return m_panelInit; } - - public void setPanelInit(boolean panelInit) { m_panelInit = panelInit; } diff --git a/src/main/webapp/games/nanoleaf/panelconfig/panelconfig.xml b/src/main/webapp/games/nanoleaf/panelconfig/panelconfig.xml index 85d2537..a11833f 100644 --- a/src/main/webapp/games/nanoleaf/panelconfig/panelconfig.xml +++ b/src/main/webapp/games/nanoleaf/panelconfig/panelconfig.xml @@ -5,7 +5,7 @@ - + diff --git a/src/main/webapp/workplace/home.xml b/src/main/webapp/workplace/home.xml index da144c0..878febe 100644 --- a/src/main/webapp/workplace/home.xml +++ b/src/main/webapp/workplace/home.xml @@ -4,6 +4,12 @@ - + + + + + + + \ No newline at end of file