Webmaster
/
webportal
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of

Browse Source 
https://gitea.raspi-developer.de/Webmaster/webportal.git
master
mail 11 months ago
parent be7cf3a015 e3a1fae4ff
commit dacdae229b
9 changed files with 101 additions and 30 deletions
Show Stats Download Patch File Download Diff File

1
.ccEclipseSynch
Unescape View File

@ -1 +0,0 @@
Src changed

1
.classpath
Unescape View File

@ -27,6 +27,7 @@
<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
<attributes>
<attribute name="maven.pomderived" value="true"/>
<attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
</attributes>
</classpathentry>
<classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources">

28
.settings/org.eclipse.wst.common.component
Unescape View File

@ -1,20 +1,28 @@
<?xml version="1.0" encoding="UTF-8"?><project-modules id="moduleCoreId" project-version="1.5.0">
<wb-module deploy-name="webportal">
<wb-resource deploy-path="/" source-path="/target/m2e-wtp/web-resources"/>
<wb-resource deploy-path="/" source-path="/src/main/webapp" tag="defaultRootSource"/>
<wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/java"/>
<wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/resources"/>
<wb-resource deploy-path="/WEB-INF/classes" source-path="/src/test/java"/>
<property name="context-root" value="webportal"/>
<property name="java-output-path" value="/webportal/target/classes"/>
</wb-module>
</wb-module>
</project-modules>

2
pom.xml
Unescape View File

@ -27,7 +27,7 @@
<properties>
<!-- This is the CaptainCasa version to be used. -->
<cc.version>20240910</cc.version>
<cc.version>20250128</cc.version>
</properties>
<dependencies>

2
src/main/java/de/games/nanoleaf/panelconfig/MatrixInfo.java
Unescape View File

@ -36,6 +36,4 @@ public class MatrixInfo {
m_countPanels = countPanels;
}
}

73
src/main/java/de/games/nanoleaf/panelconfig/NanoPANENode.java
Unescape View File

@ -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);
}
}

14
src/main/java/de/games/nanoleaf/panelconfig/PanelInfo.java
Unescape View File

@ -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;
}

2
src/main/webapp/games/nanoleaf/panelconfig/panelconfig.xml
Unescape View File

@ -5,7 +5,7 @@
<t:row id="g_5" />
<t:rowbodypane id="g_4" >
<t:row id="g_13" >
<t:splitpane id="g_14" dividerlocation="400" height="160" orientation="horizontal" width="100%" withwritebackdividerlocation="false" >
<t:splitpane id="g_14" dividerlocation="400" dividersize="2" height="160" orientation="horizontal" width="100%" withwritebackdividerlocation="true" >
<t:splitpanesplit id="g_15" >
<t:row id="g_7" >
<t:coldistance id="g_2" />

8
src/main/webapp/workplace/home.xml
Unescape View File

@ -4,6 +4,12 @@
<t:beanprocessing id="g_1" beanbinding="#{d.HomeBean}" />
<t:rowtitlebar id="g_2" text="Home" />
<t:rowheader id="g_3" />
<t:rowbodypane id="g_4" />
<t:rowbodypane id="g_4" >
<t:rowdistance id="g_6" />
<t:row id="g_7" >
<t:coldistance id="g_8" />
<t:label id="g_9" text="My Home Page :-)" />
</t:row>
</t:rowbodypane>
</t:layoutdefinition>
Write Preview
Loading…
Cancel
Save