pollo-cvs Mailing List for pollo
Status: Beta
Brought to you by:
bdumon
Menu
▾
▴
pollo-cvs — cvs commit messages
You can subscribe to this list here.
| 2002 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
(1) |
Jul
(55) |
Aug
(90) |
Sep
(38) |
Oct
|
Nov
(1) |
Dec
|
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2003 |
Jan
(21) |
Feb
|
Mar
|
Apr
|
May
(1) |
Jun
|
Jul
|
Aug
|
Sep
(56) |
Oct
(43) |
Nov
|
Dec
(1) |
|
From: <bd...@us...> - 2003-12-12 16:40:01
|
Update of /cvsroot/pollo/pollo/website
In directory sc8-pr-cvs1:/tmp/cvs-serv23463
Modified Files:
index.html
Log Message:
List requires subscription now.
Index: index.html
===================================================================
RCS file: /cvsroot/pollo/pollo/website/index.html,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** index.html 1 Oct 2003 12:37:46 -0000 1.10
--- index.html 12 Dec 2003 16:39:58 -0000 1.11
***************
*** 21,28 ****
<tr>
<td style="vertical-align: top;"><img
! src="file:///home/bruno/projects/pollo/pollo/website/treeviewsnippet.png"
alt="Screenshot of pollo's tree view" width="460" height="266"></td>
<td style="vertical-align: top;"><img
! src="file:///home/bruno/projects/pollo/pollo/website/classictreesnippet.png"
title="" alt="Classic tree screenshot"
style="height: 266px; width: 454px;"></td>
--- 21,28 ----
<tr>
<td style="vertical-align: top;"><img
! src="treeviewsnippet.png"
alt="Screenshot of pollo's tree view" width="460" height="266"></td>
<td style="vertical-align: top;"><img
! src="classictreesnippet.png"
title="" alt="Classic tree screenshot"
style="height: 266px; width: 454px;"></td>
***************
*** 140,144 ****
</p>
<ul>
! <li>Pollo's mailing list (subscription not required to post): <a
href="mailto:pol...@li...">pol...@li...</a><br>
<a
--- 140,144 ----
</p>
<ul>
! <li>Pollo's mailing list: <a
href="mailto:pol...@li...">pol...@li...</a><br>
<a
|
|
From: <bd...@us...> - 2003-10-03 10:18:00
|
Update of /cvsroot/pollo/pollo
In directory sc8-pr-cvs1:/tmp/cvs-serv7559
Modified Files:
ChangeLog
Log Message:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/pollo/pollo/ChangeLog,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** ChangeLog 3 Oct 2003 09:11:35 -0000 1.19
--- ChangeLog 3 Oct 2003 10:15:11 -0000 1.20
***************
*** 4,8 ****
- A new, more classic, tree view has been introduced next to Pollo's special
! colorful treeview.
- Support more options in the display specifications:
- for elements and attributes, a label can be defined to be shown
--- 4,9 ----
- A new, more classic, tree view has been introduced next to Pollo's special
! colorful treeview. The type of tree to be used is specified as
! part of the display specification, but can be overridden by the user.
- Support more options in the display specifications:
- for elements and attributes, a label can be defined to be shown
|
|
From: <bd...@us...> - 2003-10-03 10:06:09
|
Update of /cvsroot/pollo/pollo/src/org/outerj/pollo
In directory sc8-pr-cvs1:/tmp/cvs-serv4778/src/org/outerj/pollo
Modified Files:
EditorPanelImpl.java Pollo.java
Log Message:
Made the treetype specified in the viewtype overidable by the user.
Index: EditorPanelImpl.java
===================================================================
RCS file: /cvsroot/pollo/pollo/src/org/outerj/pollo/EditorPanelImpl.java,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -d -r1.22 -r1.23
*** EditorPanelImpl.java 1 Oct 2003 08:31:25 -0000 1.22
--- EditorPanelImpl.java 3 Oct 2003 10:06:00 -0000 1.23
***************
*** 56,60 ****
protected static ResourceManager resMgr = ResourceManager.getManager(EditorPanelImpl.class);
! public EditorPanelImpl(XmlModel xmlModel, ViewTypeConf viewTypeConf, PolloFrame polloFrame)
throws Exception
{
--- 56,60 ----
protected static ResourceManager resMgr = ResourceManager.getManager(EditorPanelImpl.class);
! public EditorPanelImpl(XmlModel xmlModel, ViewTypeConf viewTypeConf, PolloFrame polloFrame, int forcedTreeType)
throws Exception
{
***************
*** 67,71 ****
actionPlugin = viewTypeConf.createActionPlugins(this, polloFrame);
! xmlEditorPanel = new XmlEditorPanel(xmlModel, null, idisplayspecification, ischema, iattributeeditorplugin);
xmlTextEditorPanel = new XmlTextEditorPanel(xmlModel, ischema);
--- 67,71 ----
actionPlugin = viewTypeConf.createActionPlugins(this, polloFrame);
! xmlEditorPanel = new XmlEditorPanel(xmlModel, null, idisplayspecification, ischema, iattributeeditorplugin, forcedTreeType);
xmlTextEditorPanel = new XmlTextEditorPanel(xmlModel, ischema);
Index: Pollo.java
===================================================================
RCS file: /cvsroot/pollo/pollo/src/org/outerj/pollo/Pollo.java,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** Pollo.java 1 Oct 2003 08:24:21 -0000 1.19
--- Pollo.java 3 Oct 2003 10:06:00 -0000 1.20
***************
*** 147,151 ****
try
{
! editorPanel = new EditorPanelImpl(xmlModel, viewTypeConf, polloFrame);
}
catch (Exception e2)
--- 147,151 ----
try
{
! editorPanel = new EditorPanelImpl(xmlModel, viewTypeConf, polloFrame, viewTypesDialog.getTreeType());
}
catch (Exception e2)
|
|
From: <bd...@us...> - 2003-10-03 10:06:09
|
Update of /cvsroot/pollo/pollo/src/org/outerj/pollo/gui
In directory sc8-pr-cvs1:/tmp/cvs-serv4778/src/org/outerj/pollo/gui
Modified Files:
ViewTypesDialog.java
Log Message:
Made the treetype specified in the viewtype overidable by the user.
Index: ViewTypesDialog.java
===================================================================
RCS file: /cvsroot/pollo/pollo/src/org/outerj/pollo/gui/ViewTypesDialog.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** ViewTypesDialog.java 12 Sep 2003 14:52:00 -0000 1.8
--- ViewTypesDialog.java 3 Oct 2003 10:06:00 -0000 1.9
***************
*** 2,5 ****
--- 2,6 ----
import org.outerj.pollo.Pollo;
+ import org.outerj.pollo.xmleditor.displayspec.IDisplaySpecification;
import org.outerj.pollo.config.*;
***************
*** 44,47 ****
--- 45,52 ----
protected JRadioButton classicTree;
+ protected JRadioButton useConfiguredTreetype;
+ protected JRadioButton forcePolloTreetype;
+ protected JRadioButton forceClassicTreetype;
+
protected JFileChooser schemaChooser;
protected JFileChooser displaySpecChooser;
***************
*** 81,84 ****
--- 86,106 ----
verticalBox.add(box1);
+ // make a box containing the options for forcing the tree type
+ Box treetypeBox = new Box(BoxLayout.Y_AXIS);
+ useConfiguredTreetype = new JRadioButton("Specified in selected configuration.");
+ forcePolloTreetype = new JRadioButton("Pollo (colored bars)");
+ forceClassicTreetype = new JRadioButton("Classic");
+ ButtonGroup treetypeGroup = new ButtonGroup();
+ treetypeGroup.add(useConfiguredTreetype);
+ treetypeGroup.add(forcePolloTreetype);
+ treetypeGroup.add(forceClassicTreetype);
+ useConfiguredTreetype.setSelected(true);
+ treetypeBox.add(Box.createVerticalGlue());
+ treetypeBox.add(new JLabel("Use tree type:"));
+ treetypeBox.add(useConfiguredTreetype);
+ treetypeBox.add(forcePolloTreetype);
+ treetypeBox.add(forceClassicTreetype);
+ treetypeBox.add(Box.createVerticalStrut(12));
+
// make the list with predefined configuration
Pollo pollo = Pollo.getInstance();
***************
*** 109,112 ****
--- 131,136 ----
box2.add(Box.createHorizontalStrut(18));
box2.add(viewTypesListScrollPane);
+ box2.add(Box.createHorizontalStrut(12));
+ box2.add(treetypeBox);
box2.add(Box.createHorizontalGlue());
verticalBox.add(box2);
***************
*** 385,388 ****
--- 409,415 ----
{
viewTypesList.setEnabled(enabled);
+ useConfiguredTreetype.setEnabled(enabled);
+ forcePolloTreetype.setEnabled(enabled);
+ forceClassicTreetype.setEnabled(enabled);
}
***************
*** 509,512 ****
--- 536,549 ----
return viewTypeConf;
}
+ }
+
+ public int getTreeType()
+ {
+ if (forcePolloTreetype.isSelected())
+ return IDisplaySpecification.POLLO_TREE;
+ else if (forceClassicTreetype.isSelected())
+ return IDisplaySpecification.CLASSIC_TREE;
+ else
+ return -1;
}
}
|
|
From: <bd...@us...> - 2003-10-03 10:06:08
|
Update of /cvsroot/pollo/pollo/src/org/outerj/pollo/xmleditor
In directory sc8-pr-cvs1:/tmp/cvs-serv4778/src/org/outerj/pollo/xmleditor
Modified Files:
XmlEditor.java XmlEditorPanel.java
Log Message:
Made the treetype specified in the viewtype overidable by the user.
Index: XmlEditor.java
===================================================================
RCS file: /cvsroot/pollo/pollo/src/org/outerj/pollo/xmleditor/XmlEditor.java,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -d -r1.22 -r1.23
*** XmlEditor.java 12 Sep 2003 14:52:03 -0000 1.22
--- XmlEditor.java 3 Oct 2003 10:06:01 -0000 1.23
***************
*** 140,144 ****
@param displaySpec an instance of an IDisplaySpecification
*/
! public XmlEditor(String xpathForRoot, IDisplaySpecification displaySpec)
throws Exception
{
--- 140,144 ----
@param displaySpec an instance of an IDisplaySpecification
*/
! public XmlEditor(String xpathForRoot, IDisplaySpecification displaySpec, int forcedTreeType)
throws Exception
{
***************
*** 150,155 ****
setOpaque(true);
// init view factory
! switch (displaySpec.getTreeType())
{
case IDisplaySpecification.POLLO_TREE:
--- 150,156 ----
setOpaque(true);
+ int treetype = forcedTreeType == - 1 ? displaySpec.getTreeType() : forcedTreeType;
// init view factory
! switch (treetype)
{
case IDisplaySpecification.POLLO_TREE:
Index: XmlEditorPanel.java
===================================================================
RCS file: /cvsroot/pollo/pollo/src/org/outerj/pollo/xmleditor/XmlEditorPanel.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** XmlEditorPanel.java 29 Sep 2003 12:01:18 -0000 1.15
--- XmlEditorPanel.java 3 Oct 2003 10:06:01 -0000 1.16
***************
*** 51,55 ****
public XmlEditorPanel(XmlModel model, String xpathForRoot, IDisplaySpecification displaySpec,
! ISchema schema, IAttributeEditorPlugin attrEditorPlugin)
throws Exception
{
--- 51,55 ----
public XmlEditorPanel(XmlModel model, String xpathForRoot, IDisplaySpecification displaySpec,
! ISchema schema, IAttributeEditorPlugin attrEditorPlugin, int forcedTreetype)
throws Exception
{
***************
*** 60,64 ****
// create the xml content editor component
! xmlEditor = new XmlEditor(xpathForRoot, displaySpec);
JScrollPane scrollPane = new JScrollPane(xmlEditor, JScrollPane.VERTICAL_SCROLLBAR_ALWAYS,
JScrollPane.HORIZONTAL_SCROLLBAR_AS_NEEDED);
--- 60,64 ----
// create the xml content editor component
! xmlEditor = new XmlEditor(xpathForRoot, displaySpec, forcedTreetype);
JScrollPane scrollPane = new JScrollPane(xmlEditor, JScrollPane.VERTICAL_SCROLLBAR_ALWAYS,
JScrollPane.HORIZONTAL_SCROLLBAR_AS_NEEDED);
|
|
From: <bd...@us...> - 2003-10-03 09:22:18
|
Update of /cvsroot/pollo/pollo/conf
In directory sc8-pr-cvs1:/tmp/cvs-serv30090/conf
Modified Files:
pollo_conf.xml
Log Message:
Removed Cocoon Sitemap templates.
Were out of date, its better to use one from a current Cocoon dist anyhow.
Index: pollo_conf.xml
===================================================================
RCS file: /cvsroot/pollo/pollo/conf/pollo_conf.xml,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** pollo_conf.xml 1 Oct 2003 12:10:24 -0000 1.11
--- pollo_conf.xml 3 Oct 2003 09:22:14 -0000 1.12
***************
*** 205,214 ****
<parameter name="source" value="classpath:/template/build.xml"/>
</template>
- <template description="Cocoon 2.02 Sitemap" factory="org.outerj.pollo.template.FileTemplateFactory">
- <parameter name="source" value="classpath:/template/sitemap.xmap"/>
- </template>
- <template description="Cocoon 2.02 Subsitemap" factory="org.outerj.pollo.template.FileTemplateFactory">
- <parameter name="source" value="classpath:/template/subsitemap.xmap"/>
- </template>
<template description="XML Schema" factory="org.outerj.pollo.template.FileTemplateFactory">
<parameter name="source" value="classpath:/template/schema.xsd"/>
--- 205,208 ----
|
|
From: <bd...@us...> - 2003-10-03 09:22:18
|
Update of /cvsroot/pollo/pollo/conf/template In directory sc8-pr-cvs1:/tmp/cvs-serv30090/conf/template Removed Files: sitemap.xmap subsitemap.xmap Log Message: Removed Cocoon Sitemap templates. Were out of date, its better to use one from a current Cocoon dist anyhow. --- sitemap.xmap DELETED --- --- subsitemap.xmap DELETED --- |
|
From: <bd...@us...> - 2003-10-03 09:12:27
|
Update of /cvsroot/pollo/pollo/bin In directory sc8-pr-cvs1:/tmp/cvs-serv28304/bin Modified Files: pollo.bat pollo.sh Log Message: Update classpath, make pollo.sh executable from everywhere. Index: pollo.bat =================================================================== RCS file: /cvsroot/pollo/pollo/bin/pollo.bat,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** pollo.bat 2 Oct 2003 14:42:20 -0000 1.11 --- pollo.bat 3 Oct 2003 09:12:19 -0000 1.12 *************** *** 1 **** ! java -classpath ..\lib\pollo.jar;..\lib\endorsed\dom3-xmlParserAPIs.jar;..\lib\endorsed\dom3-xercesImpl.jar;..\lib\avalon-configuration.jar;..\lib\log4j-core.jar;..\lib\jaxen-core.jar;..\lib\jaxen-dom.jar;..\lib\saxpath.jar;..\lib\msv.jar;..\lib\xsdlib.jar;..\lib\relaxngDatatype.jar;..\lib\isorelax.jar;..\lib\xpp3-1.1.3.4-RC3_min.jar;..\lib\commons-lang-exception-2.0.jar;..\conf;..\build -Djava.endorsed.dirs=..\lib\endorsed org.outerj.pollo.Pollo %1 --- 1 ---- ! java -classpath ..\lib\pollo.jar;..\lib\endorsed\dom3-xmlParserAPIs.jar;..\lib\endorsed\dom3-xercesImpl.jar;..\lib\avalon-configuration.jar;..\lib\log4j-core.jar;..\lib\jaxen-core.jar;..\lib\jaxen-dom.jar;..\lib\saxpath.jar;..\lib\msv-20031002.jar;..\lib\xsdlib.jar;..\lib\relaxngDatatype.jar;..\lib\isorelax.jar;..\lib\xpp3-1.1.3.4-RC3_min.jar;..\lib\commons-lang-exception-2.0.jar;..\conf;..\build -Djava.endorsed.dirs=..\lib\endorsed org.outerj.pollo.Pollo %1 Index: pollo.sh =================================================================== RCS file: /cvsroot/pollo/pollo/bin/pollo.sh,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** pollo.sh 2 Oct 2003 14:42:21 -0000 1.10 --- pollo.sh 3 Oct 2003 09:12:19 -0000 1.11 *************** *** 1,3 **** ! export CLASSPATH=../lib/pollo.jar:../lib/endorsed/dom3-xercesImpl.jar:../lib/endorsed/dom3-xmlParserAPIs.jar:../lib/avalon-configuration.jar:../lib/log4j-core.jar:../lib/jaxen-core.jar:../lib/jaxen-dom.jar:../lib/saxpath.jar:../lib/msv.jar:../lib/xsdlib.jar:../lib/relaxngDatatype.jar:../lib/isorelax.jar:../lib/xpp3-1.1.3.4-RC3_min.jar:../lib/commons-lang-exception-2.0.jar:../conf:../build ! java -Djava.endorsed.dirs=../lib/endorsed org.outerj.pollo.Pollo $@ --- 1,5 ---- ! SCRIPTDIR=`dirname $0` ! DIR=`cd $SCRIPTDIR/..; pwd` ! export CLASSPATH=$DIR/lib/pollo.jar:$DIR/lib/endorsed/dom3-xercesImpl.jar:$DIR/lib/endorsed/dom3-xmlParserAPIs.jar:$DIR/lib/avalon-configuration.jar:$DIR/lib/log4j-core.jar:$DIR/lib/jaxen-core.jar:$DIR/lib/jaxen-dom.jar:$DIR/lib/saxpath.jar:$DIR/lib/msv-20031002.jar:$DIR/lib/xsdlib.jar:$DIR/lib/relaxngDatatype.jar:$DIR/lib/isorelax.jar:$DIR/lib/xpp3-1.1.3.4-RC3_min.jar:$DIR/lib/commons-lang-exception-2.0.jar:$DIR/conf:$DIR/build ! java -Djava.endorsed.dirs=$DIR/lib/endorsed org.outerj.pollo.Pollo $@ |
|
From: <bd...@us...> - 2003-10-03 09:12:02
|
Update of /cvsroot/pollo/pollo
In directory sc8-pr-cvs1:/tmp/cvs-serv28234
Modified Files:
build.xml
Log Message:
fix & cleanup classpath
Index: build.xml
===================================================================
RCS file: /cvsroot/pollo/pollo/build.xml,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** build.xml 12 Sep 2003 15:11:38 -0000 1.16
--- build.xml 3 Oct 2003 09:11:52 -0000 1.17
***************
*** 6,20 ****
<pathelement location="lib/endorsed/dom3-xmlParserAPIs.jar"/>
<pathelement location="lib/endorsed/dom3-xercesImpl.jar"/>
- <pathelement location="lib/commons-digester.jar"/>
<pathelement location="lib/avalon-configuration.jar"/>
- <pathelement location="lib/commons-collections.jar"/>
- <pathelement location="lib/commons-beanutils.jar"/>
<pathelement location="lib/log4j-core.jar"/>
<pathelement location="lib/jaxen-core.jar"/>
<pathelement location="lib/jaxen-dom.jar"/>
<pathelement location="lib/saxpath.jar"/>
- <pathelement location="lib/dtdparser.jar"/>
<pathelement location="lib/isorelax.jar"/>
! <pathelement location="lib/msv.jar"/>
<pathelement location="lib/relaxngDatatype.jar"/>
<pathelement location="lib/xsdlib.jar"/>
--- 6,16 ----
<pathelement location="lib/endorsed/dom3-xmlParserAPIs.jar"/>
<pathelement location="lib/endorsed/dom3-xercesImpl.jar"/>
<pathelement location="lib/avalon-configuration.jar"/>
<pathelement location="lib/log4j-core.jar"/>
<pathelement location="lib/jaxen-core.jar"/>
<pathelement location="lib/jaxen-dom.jar"/>
<pathelement location="lib/saxpath.jar"/>
<pathelement location="lib/isorelax.jar"/>
! <pathelement location="lib/msv-20031002.jar"/>
<pathelement location="lib/relaxngDatatype.jar"/>
<pathelement location="lib/xsdlib.jar"/>
|
|
From: <bd...@us...> - 2003-10-03 09:11:40
|
Update of /cvsroot/pollo/pollo
In directory sc8-pr-cvs1:/tmp/cvs-serv28214
Modified Files:
ChangeLog
Log Message:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/pollo/pollo/ChangeLog,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** ChangeLog 2 Oct 2003 14:27:13 -0000 1.18
--- ChangeLog 3 Oct 2003 09:11:35 -0000 1.19
***************
*** 44,47 ****
--- 44,50 ----
- When using a DTD as schema, required attributes have an exclamation
mark next to them in the attribute editor.
+ - Upgraded MSV to nightly build of October 2, 2003. Thanks to Gregory Davis.
+ - The pollo.sh script is now executable from everywhere, you don't
+ have to be in the 'pollo/bin' directory. Thanks to Gregory Davis.
- This release should work on Java 1.3 again
- all kind of miscellaneous small stuff
|
|
From: <bd...@us...> - 2003-10-03 09:11:21
|
Update of /cvsroot/pollo/pollo/src/org/outerj/pollo/xmleditor/schema
In directory sc8-pr-cvs1:/tmp/cvs-serv28096/src/org/outerj/pollo/xmleditor/schema
Modified Files:
MsvSchema.java
Log Message:
Updates to work with new MSV.
Index: MsvSchema.java
===================================================================
RCS file: /cvsroot/pollo/pollo/src/org/outerj/pollo/xmleditor/schema/MsvSchema.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** MsvSchema.java 2 Oct 2003 14:26:12 -0000 1.6
--- MsvSchema.java 3 Oct 2003 09:11:13 -0000 1.7
***************
*** 247,251 ****
while (it.hasNext())
{
! String value = (String)it.next();
elementSchema.subtexts.add(value);
}
--- 247,251 ----
while (it.hasNext())
{
! String value = it.next().toString();
elementSchema.subtexts.add(value);
}
***************
*** 276,280 ****
public void onValue(ValueExp exp)
{
! attrValues.add(exp.value);
}
--- 276,280 ----
public void onValue(ValueExp exp)
{
! attrValues.add(exp.value.toString());
}
***************
*** 286,290 ****
while (it.hasNext())
{
! attrValues.add(it.next());
}
}
--- 286,290 ----
while (it.hasNext())
{
! attrValues.add(it.next().toString());
}
}
|
|
From: <bd...@us...> - 2003-10-03 09:10:58
|
Update of /cvsroot/pollo/pollo/src/org/outerj/pollo/xmleditor/view
In directory sc8-pr-cvs1:/tmp/cvs-serv28029/src/org/outerj/pollo/xmleditor/view
Modified Files:
ElementBlockView.java
Log Message:
Center text inside title bar.
Index: ElementBlockView.java
===================================================================
RCS file: /cvsroot/pollo/pollo/src/org/outerj/pollo/xmleditor/view/ElementBlockView.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** ElementBlockView.java 12 Sep 2003 14:52:05 -0000 1.11
--- ElementBlockView.java 3 Oct 2003 09:10:47 -0000 1.12
***************
*** 105,111 ****
elementSpec.icon.paintIcon(xmlEditor, gr, iconH, iconV);
! int baseline = startV + max(new int[] {xmlEditor.getElementNameFontMetrics().getAscent(),
xmlEditor.getAttributeNameFontMetrics().getAscent(),
! xmlEditor.getAttributeValueFontMetrics().getAscent()}) + 2;
// draw the element name
--- 105,113 ----
elementSpec.icon.paintIcon(xmlEditor, gr, iconH, iconV);
! int textHeight = max(new int[] {xmlEditor.getElementNameFontMetrics().getAscent(),
xmlEditor.getAttributeNameFontMetrics().getAscent(),
! xmlEditor.getAttributeValueFontMetrics().getAscent()});
!
! int baseline = startV + (titleHeight / 2) + (textHeight / 2);
// draw the element name
|
|
From: <bd...@us...> - 2003-10-03 09:10:20
|
Update of /cvsroot/pollo/pollo/lib In directory sc8-pr-cvs1:/tmp/cvs-serv27858 Modified Files: isorelax.jar relaxngDatatype.jar xsdlib.jar Added Files: msv-20031002.jar Removed Files: msv.jar Log Message: Upgraded MSV to nightly build. --- NEW FILE: msv-20031002.jar --- (This appears to be a binary file; contents omitted.) Index: isorelax.jar =================================================================== RCS file: /cvsroot/pollo/pollo/lib/isorelax.jar,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 Binary files /tmp/cvs610buf and /tmp/cvsmIedXl differ Index: relaxngDatatype.jar =================================================================== RCS file: /cvsroot/pollo/pollo/lib/relaxngDatatype.jar,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 Binary files /tmp/cvsYSP7Ou and /tmp/cvsUJZ1kP differ Index: xsdlib.jar =================================================================== RCS file: /cvsroot/pollo/pollo/lib/xsdlib.jar,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 Binary files /tmp/cvsxhhyOy and /tmp/cvs64SMQ1 differ --- msv.jar DELETED --- |
|
From: <bd...@us...> - 2003-10-02 18:24:36
|
Update of /cvsroot/pollo/pollo/src/org/outerj/pollo/xmleditor/attreditor
In directory sc8-pr-cvs1:/tmp/cvs-serv25133/src/org/outerj/pollo/xmleditor/attreditor
Modified Files:
AttributeTableCellRenderer.java
Log Message:
improved display of required attributes
Index: AttributeTableCellRenderer.java
===================================================================
RCS file: /cvsroot/pollo/pollo/src/org/outerj/pollo/xmleditor/attreditor/AttributeTableCellRenderer.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** AttributeTableCellRenderer.java 2 Oct 2003 15:13:19 -0000 1.7
--- AttributeTableCellRenderer.java 2 Oct 2003 18:24:30 -0000 1.8
***************
*** 5,8 ****
--- 5,9 ----
import org.outerj.pollo.xmleditor.attreditor.AttributesTableModel.TempAttrEditInfo;
import org.outerj.pollo.xmleditor.IconManager;
+ import org.outerj.pollo.gui.EmptyIcon;
import java.awt.*;
***************
*** 20,23 ****
--- 21,26 ----
protected int column = 0;
protected Icon requiredAttributeIcon = IconManager.getIcon("org/outerj/pollo/xmleditor/attreditor/required_attribute.gif");
+ protected Icon unrequiredAttributeSpacerIcon = new EmptyIcon(requiredAttributeIcon.getIconHeight(), requiredAttributeIcon.getIconWidth());
+ protected Color disabledForeground = UIManager.getColor("Label.disabledForeground");
public Component getTableCellRendererComponent(JTable table, Object value,
***************
*** 36,45 ****
setText(taei.getLabel());
if (taei.value == null)
! setEnabled(false);
else
! setEnabled(true);
if (taei.attrSchema != null && taei.attrSchema.required)
setIcon(requiredAttributeIcon);
break;
--- 39,50 ----
setText(taei.getLabel());
if (taei.value == null)
! setForeground(disabledForeground);
else
! setForeground(Color.black);
if (taei.attrSchema != null && taei.attrSchema.required)
setIcon(requiredAttributeIcon);
+ else
+ setIcon(unrequiredAttributeSpacerIcon);
break;
***************
*** 47,56 ****
if (taei.value == null)
{
! setEnabled(false);
setText(" - ");
}
else
{
! setEnabled(true);
setText(taei.value);
}
--- 52,61 ----
if (taei.value == null)
{
! setForeground(disabledForeground);
setText(" - ");
}
else
{
! setForeground(Color.black);
setText(taei.value);
}
|
|
From: <bd...@us...> - 2003-10-02 15:13:26
|
Update of /cvsroot/pollo/pollo/src/org/outerj/pollo/xmleditor/attreditor
In directory sc8-pr-cvs1:/tmp/cvs-serv26167/src/org/outerj/pollo/xmleditor/attreditor
Modified Files:
AttributeTableCellRenderer.java
Log Message:
Fixed NPE
Index: AttributeTableCellRenderer.java
===================================================================
RCS file: /cvsroot/pollo/pollo/src/org/outerj/pollo/xmleditor/attreditor/AttributeTableCellRenderer.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** AttributeTableCellRenderer.java 2 Oct 2003 14:25:49 -0000 1.6
--- AttributeTableCellRenderer.java 2 Oct 2003 15:13:19 -0000 1.7
***************
*** 40,44 ****
setEnabled(true);
! if (taei.attrSchema.required)
setIcon(requiredAttributeIcon);
--- 40,44 ----
setEnabled(true);
! if (taei.attrSchema != null && taei.attrSchema.required)
setIcon(requiredAttributeIcon);
|
|
From: <bd...@us...> - 2003-10-02 15:11:12
|
Update of /cvsroot/pollo/pollo/src/org/outerj/pollo/resource
In directory sc8-pr-cvs1:/tmp/cvs-serv25354/src/org/outerj/pollo/resource
Modified Files:
acknowledgments.txt
Log Message:
Index: acknowledgments.txt
===================================================================
RCS file: /cvsroot/pollo/pollo/src/org/outerj/pollo/resource/acknowledgments.txt,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** acknowledgments.txt 1 Oct 2003 08:20:07 -0000 1.4
--- acknowledgments.txt 2 Oct 2003 15:11:05 -0000 1.5
***************
*** 13,21 ****
(Xerces' support for mutation events is essential to Pollo).
- Log4j for logging (not used much yet).
- - Apache Jakarta's Commons Digester for building the configuration
- objects from XML files.
- Sun's excellent Multi Schema Validator (MSV) for support of
XML Schema, RELAX-NG, DTD, etc.
- Jaxen to evaluate XPath expressions.
See the online help for the licenses of these libraries.
--- 13,21 ----
(Xerces' support for mutation events is essential to Pollo).
- Log4j for logging (not used much yet).
- Sun's excellent Multi Schema Validator (MSV) for support of
XML Schema, RELAX-NG, DTD, etc.
- Jaxen to evaluate XPath expressions.
+ - XPP pull parser for reading configuration files
+ - Jakarta Commons Lang for nested exceptions.
See the online help for the licenses of these libraries.
|
|
From: <bd...@us...> - 2003-10-02 14:42:25
|
Update of /cvsroot/pollo/pollo/bin In directory sc8-pr-cvs1:/tmp/cvs-serv20392 Modified Files: pollo.bat pollo.sh Log Message: removed some obsolete jars from the classpath Index: pollo.bat =================================================================== RCS file: /cvsroot/pollo/pollo/bin/pollo.bat,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** pollo.bat 12 Sep 2003 15:12:46 -0000 1.10 --- pollo.bat 2 Oct 2003 14:42:20 -0000 1.11 *************** *** 1 **** ! java -classpath ..\lib\pollo.jar;..\lib\pollohelp.jar;..\lib\endorsed\dom3-xmlParserAPIs.jar;..\lib\endorsed\dom3-xercesImpl.jar;..\lib\avalon-configuration.jar;..\lib\commons-beanutils.jar;..\lib\commons-collections.jar;..\lib\log4j-core.jar;..\lib\jaxen-core.jar;..\lib\jaxen-dom.jar;..\lib\saxpath.jar;..\lib\msv.jar;..\lib\xsdlib.jar;..\lib\relaxngDatatype.jar;..\lib\isorelax.jar;..\lib\xpp3-1.1.3.4-RC3_min.jar;..\lib\commons-lang-exception-2.0.jar;..\conf;..\build -Djava.endorsed.dirs=..\lib\endorsed org.outerj.pollo.Pollo %1 --- 1 ---- ! java -classpath ..\lib\pollo.jar;..\lib\endorsed\dom3-xmlParserAPIs.jar;..\lib\endorsed\dom3-xercesImpl.jar;..\lib\avalon-configuration.jar;..\lib\log4j-core.jar;..\lib\jaxen-core.jar;..\lib\jaxen-dom.jar;..\lib\saxpath.jar;..\lib\msv.jar;..\lib\xsdlib.jar;..\lib\relaxngDatatype.jar;..\lib\isorelax.jar;..\lib\xpp3-1.1.3.4-RC3_min.jar;..\lib\commons-lang-exception-2.0.jar;..\conf;..\build -Djava.endorsed.dirs=..\lib\endorsed org.outerj.pollo.Pollo %1 Index: pollo.sh =================================================================== RCS file: /cvsroot/pollo/pollo/bin/pollo.sh,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** pollo.sh 12 Sep 2003 15:12:46 -0000 1.9 --- pollo.sh 2 Oct 2003 14:42:21 -0000 1.10 *************** *** 1,3 **** ! export CLASSPATH=../lib/pollo.jar:../lib/pollohelp.jar:../lib/endorsed/dom3-xercesImpl.jar:../lib/endorsed/dom3-xmlParserAPIs.jar:../lib/avalon-configuration.jar:../lib/commons-beanutils.jar:../lib/commons-collections.jar:../lib/log4j-core.jar:../lib/jaxen-core.jar:../lib/jaxen-dom.jar:../lib/saxpath.jar:../lib/msv.jar:../lib/xsdlib.jar:../lib/relaxngDatatype.jar:../lib/isorelax.jar:../lib/xpp3-1.1.3.4-RC3_min.jar:../lib/commons-lang-exception-2.0.jar:../conf:../build java -Djava.endorsed.dirs=../lib/endorsed org.outerj.pollo.Pollo $@ --- 1,3 ---- ! export CLASSPATH=../lib/pollo.jar:../lib/endorsed/dom3-xercesImpl.jar:../lib/endorsed/dom3-xmlParserAPIs.jar:../lib/avalon-configuration.jar:../lib/log4j-core.jar:../lib/jaxen-core.jar:../lib/jaxen-dom.jar:../lib/saxpath.jar:../lib/msv.jar:../lib/xsdlib.jar:../lib/relaxngDatatype.jar:../lib/isorelax.jar:../lib/xpp3-1.1.3.4-RC3_min.jar:../lib/commons-lang-exception-2.0.jar:../conf:../build java -Djava.endorsed.dirs=../lib/endorsed org.outerj.pollo.Pollo $@ |
|
From: <bd...@us...> - 2003-10-02 14:40:38
|
Update of /cvsroot/pollo/pollo/lib In directory sc8-pr-cvs1:/tmp/cvs-serv20052 Removed Files: versions.txt Log Message: removed obsolete file --- versions.txt DELETED --- |
|
From: <bd...@us...> - 2003-10-02 14:27:18
|
Update of /cvsroot/pollo/pollo
In directory sc8-pr-cvs1:/tmp/cvs-serv18104
Modified Files:
ChangeLog
Log Message:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/pollo/pollo/ChangeLog,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** ChangeLog 1 Oct 2003 18:40:04 -0000 1.17
--- ChangeLog 2 Oct 2003 14:27:13 -0000 1.18
***************
*** 42,45 ****
--- 42,47 ----
an experiment. There is now a view-type for editing the
display specfication files.
+ - When using a DTD as schema, required attributes have an exclamation
+ mark next to them in the attribute editor.
- This release should work on Java 1.3 again
- all kind of miscellaneous small stuff
|
|
From: <bd...@us...> - 2003-10-02 14:26:17
|
Update of /cvsroot/pollo/pollo/src/org/outerj/pollo/xmleditor/schema
In directory sc8-pr-cvs1:/tmp/cvs-serv17876/src/org/outerj/pollo/xmleditor/schema
Modified Files:
MsvSchema.java
Log Message:
When the schema is a DTD, keep track of which attributes are required.
Index: MsvSchema.java
===================================================================
RCS file: /cvsroot/pollo/pollo/src/org/outerj/pollo/xmleditor/schema/MsvSchema.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** MsvSchema.java 29 Sep 2003 11:50:09 -0000 1.5
--- MsvSchema.java 2 Oct 2003 14:26:12 -0000 1.6
***************
*** 66,69 ****
--- 66,70 ----
saxParserFactory.setNamespaceAware(true);
+ boolean trackOptionalAttributes = false;
InputSource inputSource = new InputSource(URLFactory.createUrl(source).toExternalForm());
String type = (String)initParams.get("type");
***************
*** 71,74 ****
--- 72,76 ----
{
grammar = DTDReader.parse(inputSource, new PolloMsvController());
+ trackOptionalAttributes = true;
}
else
***************
*** 83,87 ****
elementSchemas = new NodeMap();
! MsvGrammarWalker walker = new MsvGrammarWalker();
grammar.getTopLevel().visit(walker);
--- 85,89 ----
elementSchemas = new NodeMap();
! MsvGrammarWalker walker = new MsvGrammarWalker(trackOptionalAttributes);
grammar.getTopLevel().visit(walker);
***************
*** 103,106 ****
--- 105,119 ----
ElementSchema elementSchema; // the current ElementSchema being created
final SubNodeWalker subNodeWalker = new SubNodeWalker();
+ final boolean trackOptionalAttributes;
+
+ /**
+ * @param trackOptionalAttributes in general, should only be used for DTD's
+ * because for other schema languages the content model for attributes can be more complex,
+ * or the same element name may be reused with different required attributes on it.
+ */
+ public MsvGrammarWalker(boolean trackOptionalAttributes)
+ {
+ this.trackOptionalAttributes = trackOptionalAttributes;
+ }
public void onElement(ElementExp exp)
***************
*** 145,148 ****
--- 158,162 ----
protected final HashSet attrValues = new HashSet();
protected final AttributeWalker attrWalker = new AttributeWalker();
+ protected boolean nextAttributeOptional = false;
public void onElement(ElementExp subExp)
***************
*** 179,182 ****
--- 193,202 ----
attrSchema = new AttributeSchema(names[0], names[1], null, null);
+ if (trackOptionalAttributes)
+ {
+ attrSchema.required = !nextAttributeOptional;
+ nextAttributeOptional = false;
+ }
+
// search possible values for this attribute by using the AttributeWalker
attrValues.clear();
***************
*** 187,190 ****
--- 207,236 ----
}
}
+ }
+
+ public void onChoice(ChoiceExp choiceExp)
+ {
+ if (trackOptionalAttributes)
+ {
+ if (choiceExp.exp1 == Expression.epsilon)
+ {
+ if (choiceExp.exp2 instanceof AttributeExp)
+ {
+ nextAttributeOptional = true;
+ choiceExp.exp2.visit(this);
+ return;
+ }
+ }
+ else if (choiceExp.exp2 == Expression.epsilon)
+ {
+ if (choiceExp.exp1 instanceof AttributeExp)
+ {
+ nextAttributeOptional = true;
+ choiceExp.exp1.visit(this);
+ return;
+ }
+ }
+ }
+ super.onChoice(choiceExp);
}
|
|
From: <bd...@us...> - 2003-10-02 14:25:55
|
Update of /cvsroot/pollo/pollo/src/org/outerj/pollo/xmleditor/attreditor
In directory sc8-pr-cvs1:/tmp/cvs-serv17803/src/org/outerj/pollo/xmleditor/attreditor
Modified Files:
AttributeTableCellRenderer.java
Log Message:
Put an icon next to required attributes
Index: AttributeTableCellRenderer.java
===================================================================
RCS file: /cvsroot/pollo/pollo/src/org/outerj/pollo/xmleditor/attreditor/AttributeTableCellRenderer.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** AttributeTableCellRenderer.java 12 Sep 2003 14:52:03 -0000 1.5
--- AttributeTableCellRenderer.java 2 Oct 2003 14:25:49 -0000 1.6
***************
*** 4,7 ****
--- 4,9 ----
import javax.swing.table.DefaultTableCellRenderer;
import org.outerj.pollo.xmleditor.attreditor.AttributesTableModel.TempAttrEditInfo;
+ import org.outerj.pollo.xmleditor.IconManager;
+
import java.awt.*;
***************
*** 17,20 ****
--- 19,23 ----
protected TempAttrEditInfo taei = null;
protected int column = 0;
+ protected Icon requiredAttributeIcon = IconManager.getIcon("org/outerj/pollo/xmleditor/attreditor/required_attribute.gif");
public Component getTableCellRendererComponent(JTable table, Object value,
***************
*** 26,29 ****
--- 29,33 ----
taei = tableModel.getTempAttrEditInfo(row);
this.column = column;
+ setIcon(null);
switch (column)
***************
*** 35,38 ****
--- 39,46 ----
else
setEnabled(true);
+
+ if (taei.attrSchema.required)
+ setIcon(requiredAttributeIcon);
+
break;
case 1:
***************
*** 65,69 ****
int arrowWidth = 10;
- int arrowHeight = 5;
int x = getWidth() - arrowWidth - 2;
int y = (getHeight() / 2) - 2;
--- 73,76 ----
|
|
From: <bd...@us...> - 2003-10-02 14:25:34
|
Update of /cvsroot/pollo/pollo/src/org/outerj/pollo/xmleditor/attreditor In directory sc8-pr-cvs1:/tmp/cvs-serv17757/src/org/outerj/pollo/xmleditor/attreditor Added Files: required_attribute.gif Log Message: initial commit --- NEW FILE: required_attribute.gif --- (This appears to be a binary file; contents omitted.) |
|
From: <bd...@us...> - 2003-10-02 14:25:09
|
Update of /cvsroot/pollo/pollo/src/org/outerj/pollo/xmleditor/schema
In directory sc8-pr-cvs1:/tmp/cvs-serv17644/src/org/outerj/pollo/xmleditor/schema
Modified Files:
AttributeSchema.java
Log Message:
Added a field to make it possible to mark attribute as required.
Index: AttributeSchema.java
===================================================================
RCS file: /cvsroot/pollo/pollo/src/org/outerj/pollo/xmleditor/schema/AttributeSchema.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** AttributeSchema.java 27 Aug 2002 20:44:04 -0000 1.5
--- AttributeSchema.java 2 Oct 2003 14:25:05 -0000 1.6
***************
*** 25,28 ****
--- 25,29 ----
public final String xpathExpr;
public String [] values;
+ public boolean required = false;
public AttributeSchema(String namespaceURI, String localName, String xpathExpr, NamespaceContext namespaceContext)
|
|
From: <bd...@us...> - 2003-10-01 18:40:08
|
Update of /cvsroot/pollo/pollo
In directory sc8-pr-cvs1:/tmp/cvs-serv13952
Modified Files:
ChangeLog
Log Message:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/pollo/pollo/ChangeLog,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** ChangeLog 1 Oct 2003 12:16:35 -0000 1.16
--- ChangeLog 1 Oct 2003 18:40:04 -0000 1.17
***************
*** 42,45 ****
--- 42,46 ----
an experiment. There is now a view-type for editing the
display specfication files.
+ - This release should work on Java 1.3 again
- all kind of miscellaneous small stuff
|
|
From: <bd...@us...> - 2003-10-01 18:35:49
|
Update of /cvsroot/pollo/pollo/src/org/outerj/pollo
In directory sc8-pr-cvs1:/tmp/cvs-serv12962/src/org/outerj/pollo
Modified Files:
PolloFrame.java
Log Message:
Fixed problem with broken menus and toolbar after using "close all views except this" action.
Index: PolloFrame.java
===================================================================
RCS file: /cvsroot/pollo/pollo/src/org/outerj/pollo/PolloFrame.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** PolloFrame.java 1 Oct 2003 08:25:57 -0000 1.16
--- PolloFrame.java 1 Oct 2003 18:35:41 -0000 1.17
***************
*** 469,472 ****
--- 469,475 ----
}
}
+ // make sure the correct toolbars and menu items are shown -- apparently this can get
+ // messed up while removing the editorpanels.
+ stateChanged(null);
}
}
|