Revision: 4624
Author: seba.wagner
Date: Wed Nov 23 08:30:13 2011
Log: Update to some DTDs
http://code.google.com/p/openmeetings/source/detail?r=4624
Added:
/trunk/singlewebapp/test/basic.xml
Modified:
/trunk/singlewebapp/WebContent/src/base/auth/checkLoginData.lzx
/trunk/singlewebapp/WebContent/src/base/auth/loginDirect.lzx
/trunk/singlewebapp/WebContent/src/base/auth/registerNewUser.lzx
/trunk/singlewebapp/WebContent/src/base/auth/resetForm.lzx
/trunk/singlewebapp/openlaszlo/lps/components/lfc/audio.lzx
/trunk/singlewebapp/openlaszlo/lps/components/lfc/font.lzx
/trunk/singlewebapp/openlaszlo/lps/components/lfc/frame.lzx
/trunk/singlewebapp/openlaszlo/lps/components/lfc/resource.lzx
/trunk/singlewebapp/openlaszlo/lps/components/lfc/splash.lzx
/trunk/singlewebapp/openlaszlo/lps/components/lfc/text.lzx
/trunk/singlewebapp/project.dtd
/trunk/singlewebapp/src/dtdgenerator/org/openlaszlo/generator/GenerateProjectDTD.java
/trunk/singlewebapp/src/dtdgenerator/org/openlaszlo/generator/elements/ClassElementList.java
/trunk/singlewebapp/test/basic.dtd
Replaced:
/trunk/singlewebapp/WebContent/project.dtd
=======================================
--- /dev/null
+++ /trunk/singlewebapp/test/basic.xml Wed Nov 23 08:30:13 2011
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE class SYSTEM "basic.dtd" >
+<canvas>
+
+
+</canvas>
=======================================
--- /trunk/singlewebapp/WebContent/src/base/auth/checkLoginData.lzx Sun Nov
20 08:37:52 2011
+++ /trunk/singlewebapp/WebContent/src/base/auth/checkLoginData.lzx Wed Nov
23 08:30:13 2011
@@ -1,4 +1,5 @@
<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE library SYSTEM "/project.dtd">
<library>
<!--- LOGIN panel window -->
=======================================
--- /trunk/singlewebapp/WebContent/src/base/auth/loginDirect.lzx Mon Oct 12
03:48:00 2009
+++ /trunk/singlewebapp/WebContent/src/base/auth/loginDirect.lzx Wed Nov 23
08:30:13 2011
@@ -1,4 +1,5 @@
<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE library SYSTEM "/project.dtd">
<library>
<class name="loginWeb" extends="explorerBox" title="WebRooms"
=======================================
--- /trunk/singlewebapp/WebContent/src/base/auth/registerNewUser.lzx Wed
Nov 16 06:36:51 2011
+++ /trunk/singlewebapp/WebContent/src/base/auth/registerNewUser.lzx Wed
Nov 23 08:30:13 2011
@@ -1,4 +1,5 @@
<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE library SYSTEM "/project.dtd">
<library>
<class name="registerNewUser" extends="labelExplorerBox" labelid="113"
=======================================
--- /trunk/singlewebapp/WebContent/src/base/auth/resetForm.lzx Tue Nov 10
13:03:19 2009
+++ /trunk/singlewebapp/WebContent/src/base/auth/resetForm.lzx Wed Nov 23
08:30:13 2011
@@ -1,4 +1,5 @@
<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE library SYSTEM "/project.dtd">
<library>
<!-- Form shown in the Login Box -->
=======================================
--- /trunk/singlewebapp/openlaszlo/lps/components/lfc/audio.lzx Wed Nov 23
06:57:24 2011
+++ /trunk/singlewebapp/openlaszlo/lps/components/lfc/audio.lzx Wed Nov 23
08:30:13 2011
@@ -1,4 +1,4 @@
-<class name="audio">
+<class name="audio" extends="node">
<attribute name="src" />
=======================================
--- /trunk/singlewebapp/openlaszlo/lps/components/lfc/font.lzx Wed Nov 23
06:57:24 2011
+++ /trunk/singlewebapp/openlaszlo/lps/components/lfc/font.lzx Wed Nov 23
08:30:13 2011
@@ -1,4 +1,4 @@
-<class name="font">
+<class name="font" extends="node">
<attribute name="name" />
<attribute name="src" />
=======================================
--- /trunk/singlewebapp/openlaszlo/lps/components/lfc/frame.lzx Wed Nov 23
06:57:24 2011
+++ /trunk/singlewebapp/openlaszlo/lps/components/lfc/frame.lzx Wed Nov 23
08:30:13 2011
@@ -1,4 +1,4 @@
-<class name="frame" >
+<class name="frame" extends="node">
<attribute name="src" />
=======================================
--- /trunk/singlewebapp/openlaszlo/lps/components/lfc/resource.lzx Wed Nov
23 06:57:24 2011
+++ /trunk/singlewebapp/openlaszlo/lps/components/lfc/resource.lzx Wed Nov
23 08:30:13 2011
@@ -1,4 +1,4 @@
-<class name="resource" >
+<class name="resource" extends="node">
<attribute name="name" />
<attribute name="offsetx" />
=======================================
--- /trunk/singlewebapp/openlaszlo/lps/components/lfc/splash.lzx Wed Nov 23
06:57:24 2011
+++ /trunk/singlewebapp/openlaszlo/lps/components/lfc/splash.lzx Wed Nov 23
08:30:13 2011
@@ -1,4 +1,4 @@
-<class name="splash">
+<class name="splash" extends="node">
<attribute name="persistent" />
<attribute name="center" />
=======================================
--- /trunk/singlewebapp/openlaszlo/lps/components/lfc/text.lzx Wed Nov 23
06:57:24 2011
+++ /trunk/singlewebapp/openlaszlo/lps/components/lfc/text.lzx Wed Nov 23
08:30:13 2011
@@ -1,4 +1,4 @@
-<class name="text">
+<class name="text" extends="view">
<attribute name="antiAliasType" />
<attribute name="cdata" />
=======================================
--- /trunk/singlewebapp/project.dtd Wed Nov 23 07:31:59 2011
+++ /trunk/singlewebapp/project.dtd Wed Nov 23 08:30:13 2011
File is too large to display a diff.
=======================================
---
/trunk/singlewebapp/src/dtdgenerator/org/openlaszlo/generator/GenerateProjectDTD.java
Wed Nov 23 07:31:59 2011
+++
/trunk/singlewebapp/src/dtdgenerator/org/openlaszlo/generator/GenerateProjectDTD.java
Wed Nov 23 08:30:13 2011
@@ -63,10 +63,13 @@
}
public GenerateProjectDTD(String basePath) {
+
+ this.scanFolder("openlaszlo/lps/");
+
this.scanFolder(basePath);
// elementList.filePrint();
- elementList.filePrint(true, "project.dtd", "test/lzx.dtd");
+ elementList.filePrint(true, "project.dtd", "test/basic.dtd");
}
public void scanFolder(String filePath) {
@@ -164,10 +167,12 @@
String extendsName = atts.getValue("extends");
if (extendsName == null) {
- if (className.equals("node")) {
+ if (className.equals("view")) {
+ extendsName = "node";
+ } else if (className.equals("node")) {
extendsName = "";
} else {
- extendsName = "node";
+ extendsName = "view";
}
}
=======================================
---
/trunk/singlewebapp/src/dtdgenerator/org/openlaszlo/generator/elements/ClassElementList.java
Wed Nov 23 07:31:59 2011
+++
/trunk/singlewebapp/src/dtdgenerator/org/openlaszlo/generator/elements/ClassElementList.java
Wed Nov 23 08:30:13 2011
@@ -39,25 +39,7 @@
element.getAttributes().add(new ClassAttribute(name, required));
}
- private void debugPrint() {
-
- for (Entry<String, ClassElement> entry : elementList
- .entrySet()) {
-
- String className = entry.getKey();
- ClassElement element = entry.getValue();
-
- System.out.println("TAG "+className+ " " +
element.getParentAsString());
-
- String tString = " -> Attributes: ";
- for (ClassAttribute attr :
element.getAllClassAttributes()) {
- tString += " "+attr.getName();
- }
-
- System.out.println(tString);
-
- }
- }
+
public void fixParents() {
@@ -83,6 +65,24 @@
}
+ }
+
+ private void generateBaseClassTag() {
+
+ ClassElement element = new ClassElement();
+ element.setParentAsString("");
+
+ element.getAttributes().add(new ClassAttribute("extends",
false));
+
+ for (Entry<String, ClassElement> entry : elementList
+ .entrySet()) {
+
+ ClassElement elementTemp = entry.getValue();
+
element.getAttributes().addAll(elementTemp.getAllClassAttributes());
+ }
+
+ elementList.put("class", element);
+
}
public final String[] TEXT_OPTION_ENABLED = { "handler", "method", "text"
};
@@ -105,6 +105,8 @@
this.fixParents();
+ this.generateBaseClassTag();
+
f.createNewFile();
OutputStream ou = new FileOutputStream(f);
@@ -159,57 +161,13 @@
ou.write(sBuilder.toString().getBytes());
}
-
-// for (Entry<String, Element> entry : elementList
-// .entrySet()) {
-//
-// String key = entry.getKey();
-// Element element = entry.getValue();
-//
-// StringBuilder sBuilder = new StringBuilder();
-//
-// if (element.getChildelements().size()>0) {
-// sBuilder.append("<!ELEMENT " + key + " (
");
-// int i = 0;
-// for (String child :
element.getChildelements()) {
-// if (i!=0) {
-// sBuilder.append(" |");
-// }
-// sBuilder.append(" "+child+"");
-// i++;
-// }
-// sBuilder.append(" )* >\n");
-// } else {
-//
-// if (checkAllowSingleTextNode(key)) {
-// sBuilder.append("<!ELEMENT " + key + "
( #PCDATA ) > \n");
-// } else {
-// sBuilder.append("<!ELEMENT " + key + "
EMPTY > \n");
-// }
-//
-// }
-//
-// if (element.getAttributes().size() > 0) {
-// sBuilder.append("<!ATTLIST " + key + "
\n");
-//
-// for (String attribute :
element.getAttributes()) {
-// sBuilder.append(" " + attribute +
" CDATA #IMPLIED \n");
-// }
-// sBuilder.append(">\n");
-// }
-//
-// if (debug) {
-// System.out.print(sBuilder);
-// }
-//
-// ou.write(sBuilder.toString().getBytes());
-//
-// }
ou.close();
} catch (Exception err) {
err.printStackTrace();
}
}
+
+
}
=======================================
--- /trunk/singlewebapp/test/basic.dtd Wed Nov 23 06:57:24 2011
+++ /trunk/singlewebapp/test/basic.dtd Wed Nov 23 08:30:13 2011
@@ -45,15 +45,6 @@
type CDATA #IMPLIED
value CDATA #IMPLIED
>
-<!ELEMENT class ANY >
-<!ATTLIST class
- name CDATA #REQUIRED
- required CDATA #IMPLIED
- allocation CDATA #IMPLIED
- style CDATA #IMPLIED
- type CDATA #IMPLIED
- value CDATA #IMPLIED
->
<!ELEMENT canvas ANY >
<!ATTLIST canvas
allowfullscreen CDATA #IMPLIED
=======================================
--- /trunk/singlewebapp/WebContent/project.dtd Wed Nov 23 07:31:59 2011
+++ /trunk/singlewebapp/WebContent/project.dtd Wed Nov 23 08:30:13 2011
File is too large to display a diff.
--
You received this message because you are subscribed to the Google Groups
"OpenMeetings developers" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to
[email protected].
For more options, visit this group at
http://groups.google.com/group/openmeetings-dev?hl=en.
