December 2007 - jbosstools-commits

JBoss Tools SVN: r5263 - in trunk/common/plugins/org.jboss.tools.common.model.ui: src/org/jboss/tools/common/model/ui/wizard/newfile and 1 other directory.

by jbosstools-commits＠lists.jboss.org

Author: scabanovich Date: 2007-12-12 11:26:48 -0500 (Wed, 12 Dec 2007) New Revision: 5263 Added: trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/wizard/newfile/WizardInvoker.java Modified: trunk/common/plugins/org.jboss.tools.common.model.ui/plugin.xml Log: JBIDE-1474 Modified: trunk/common/plugins/org.jboss.tools.common.model.ui/plugin.xml =================================================================== --- trunk/common/plugins/org.jboss.tools.common.model.ui/plugin.xml 2007-12-12 16:26:10 UTC (rev 5262) +++ trunk/common/plugins/org.jboss.tools.common.model.ui/plugin.xml 2007-12-12 16:26:48 UTC (rev 5263) @@ -177,6 +177,8 @@ </specialwizard> <specialwizard class="org.jboss.tools.common.model.ui.wizard.newfile.NewClassCreationWizard" id="org.jboss.tools.common.model.ui.wizard.newfile.NewClassCreationWizard"> </specialwizard> + <specialwizard class="org.jboss.tools.common.model.ui.wizard.newfile.WizardInvoker" id="org.jboss.tools.common.model.ui.wizard.newfile.WizardInvoker"> + </specialwizard> </extension> <extension point="org.jboss.tools.common.model.modelObjectAdapter"> <modelObjectAdapter class="org.jboss.tools.common.model.ui.action.XModelObjectActionFilter" iclass="IActionFilter"> @@ -417,6 +419,8 @@ class="org.jboss.tools.common.model.ui.attribute.adapter.JavaClassNewValueProvider"/> <xclass id="org.jboss.tools.common.model.ui.templates.preferences.AddInterfaceSupport" class="org.jboss.tools.common.model.ui.templates.preferences.AddInterfaceSupport"/> + <xclass id="org.jboss.tools.common.model.ui.wizard.newfile.WizardInvoker" + class="org.jboss.tools.common.model.ui.wizard.newfile.WizardInvoker"/> </extension> <extension Added: trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/wizard/newfile/WizardInvoker.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/wizard/newfile/WizardInvoker.java (rev 0) +++ trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/wizard/newfile/WizardInvoker.java 2007-12-12 16:26:48 UTC (rev 5263) @@ -0,0 +1,47 @@ +package org.jboss.tools.common.model.ui.wizard.newfile; + +import java.util.Properties; + +import org.eclipse.jface.viewers.StructuredSelection; +import org.eclipse.jface.wizard.WizardDialog; +import org.eclipse.ui.INewWizard; +import org.eclipse.ui.PlatformUI; +import org.jboss.tools.common.meta.action.SpecialWizard; +import org.jboss.tools.common.model.XModelObject; +import org.jboss.tools.common.model.ui.ModelUIPlugin; +import org.jboss.tools.common.model.ui.util.ExtensionPointUtils; + +public class WizardInvoker implements SpecialWizard { + Properties p; + + public void setObject(Object object) { + if(object instanceof Properties) { + p = (Properties)object; + } + + } + + public int execute() { + if(p == null) { + return 1; + } + String pluginId = p.getProperty("plugin"); + String wizardId = p.getProperty("wizard"); + XModelObject s = (XModelObject)p.get("object"); + INewWizard wizard = ExtensionPointUtils.findNewWizardsItem(pluginId, wizardId); + + if(wizard == null || s == null) { + return 1; + } + + wizard.init(PlatformUI.getWorkbench(), new StructuredSelection(s)); + + WizardDialog dialog = new WizardDialog(ModelUIPlugin.getDefault().getWorkbench().getActiveWorkbenchWindow().getShell(), wizard); + dialog.create(); + PlatformUI.getWorkbench().getHelpSystem().setHelp(dialog.getShell(), "org.eclipse.ui.new_wizard_shortcut_context"); + dialog.open(); + + return 0; + } + +}

18 years

1
0
0 / 0

JBoss Tools SVN: r5262 - in trunk/common/plugins/org.jboss.tools.common.model: resources/meta and 1 other directories.

by jbosstools-commits＠lists.jboss.org

Author: scabanovich Date: 2007-12-12 11:26:10 -0500 (Wed, 12 Dec 2007) New Revision: 5262 Added: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/files/handlers/InvokingWizardHandler.java Modified: trunk/common/plugins/org.jboss.tools.common.model/plugin.xml trunk/common/plugins/org.jboss.tools.common.model/resources/meta/files.meta Log: JBIDE-1474 Modified: trunk/common/plugins/org.jboss.tools.common.model/plugin.xml =================================================================== --- trunk/common/plugins/org.jboss.tools.common.model/plugin.xml 2007-12-12 15:07:22 UTC (rev 5261) +++ trunk/common/plugins/org.jboss.tools.common.model/plugin.xml 2007-12-12 16:26:10 UTC (rev 5262) @@ -132,6 +132,8 @@ class="org.jboss.tools.common.model.engines.impl.StopProcessHandler"/> <xclass id="org.jboss.tools.common.model.files.handlers.JSPAdopt" class="org.jboss.tools.common.model.files.handlers.JSPAdopt"/> + <xclass id="org.jboss.tools.common.model.files.handlers.InvokingWizardHandler" + class="org.jboss.tools.common.model.files.handlers.InvokingWizardHandler"/> <xclass id="org.jboss.tools.common.model.filesystems.impl.CreateFileHandler" class="org.jboss.tools.common.model.filesystems.impl.CreateFileHandler"/> <xclass id="org.jboss.tools.common.model.filesystems.impl.CreateFolderHandler" Modified: trunk/common/plugins/org.jboss.tools.common.model/resources/meta/files.meta =================================================================== --- trunk/common/plugins/org.jboss.tools.common.model/resources/meta/files.meta 2007-12-12 15:07:22 UTC (rev 5261) +++ trunk/common/plugins/org.jboss.tools.common.model/resources/meta/files.meta 2007-12-12 16:26:10 UTC (rev 5262) @@ -9,6 +9,7 @@ <PAIR name="CreateFolder" value="org.jboss.tools.common.model.filesystems.impl.CreateFolderHandler"/> <PAIR name="DeleteFile" value="org.jboss.tools.common.model.filesystems.impl.DeleteFileHandler"/> <PAIR name="RenameFile" value="org.jboss.tools.common.model.filesystems.impl.handlers.RenameFileHandler"/> + <PAIR name="WizardInvoker" value="org.jboss.tools.common.model.files.handlers.InvokingWizardHandler"/> </MAPPING> </MAPPINGS> <ICONS/> @@ -24,23 +25,16 @@ </XEntityRenderer> <XModelAttributes> <XModelAttribute default="gif file" loader="ElementType" name="element type"> - <Constraint/> <Editor name="Uneditable"/> </XModelAttribute> - <XModelAttribute PROPERTIES="id=true" name="name" xmlname="NAME"> - <Constraint/> - <Editor/> - </XModelAttribute> + <XModelAttribute PROPERTIES="id=true" name="name" xmlname="NAME"/> <XModelAttribute TRIM="no" name="body" visibility="false"> - <Constraint/> <Editor name="Uneditable"/> </XModelAttribute> <XModelAttribute name="extension" xmlname="EXTENSION"> - <Constraint/> <Editor name="Uneditable"/> </XModelAttribute> <XModelAttribute name="_file" visibility="false"> - <Constraint/> <Editor name="Uneditable"/> </XModelAttribute> </XModelAttributes> @@ -109,17 +103,10 @@ <XModelAttributes> <XModelAttribute default="html" loader="ElementType" name="element type" visibility="false"> - <Constraint/> <Editor name="Uneditable"/> </XModelAttribute> - <XModelAttribute name="name" xmlname="NAME"> - <Constraint/> - <Editor/> - </XModelAttribute> - <XModelAttribute TRIM="no" name="body" visibility="false"> - <Constraint/> - <Editor/> - </XModelAttribute> + <XModelAttribute name="name" xmlname="NAME"/> + <XModelAttribute TRIM="no" name="body" visibility="false"/> <XModelAttribute default="html" name="extension" xmlname="EXTENSION"> <Constraint loader="List"> <value name="html"/> @@ -128,7 +115,6 @@ <Editor name="List"/> </XModelAttribute> <XModelAttribute loader="ElementType" name="_lateload" visibility="false"> - <Constraint/> <Editor name="Uneditable"/> </XModelAttribute> </XModelAttributes> @@ -208,27 +194,17 @@ <XModelAttributes> <XModelAttribute default="jsp file" loader="ElementType" name="element type" visibility="false"> - <Constraint/> <Editor name="Uneditable"/> </XModelAttribute> <XModelAttribute COPYABLE="no" loader="ModelPath" name="model path" visibility="false"> - <Constraint/> <Editor name="Uneditable" viewer="%View%"/> </XModelAttribute> - <XModelAttribute name="name" xmlname="NAME"> - <Constraint/> - <Editor/> - </XModelAttribute> - <XModelAttribute TRIM="no" name="body" visibility="false"> - <Constraint/> - <Editor/> - </XModelAttribute> + <XModelAttribute name="name" xmlname="NAME"/> + <XModelAttribute TRIM="no" name="body" visibility="false"/> <XModelAttribute default="jsp" name="extension" xmlname="EXTENSION"> - <Constraint/> <Editor name="Uneditable"/> </XModelAttribute> <XModelAttribute loader="ElementType" name="_lateload" visibility="false"> - <Constraint/> <Editor name="Uneditable"/> </XModelAttribute> </XModelAttributes> @@ -308,16 +284,11 @@ </XEntityRenderer> <XModelAttributes> <XModelAttribute default="properties file" loader="ElementType" name="element type"> - <Constraint/> <Editor name="Uneditable"/> </XModelAttribute> - <XModelAttribute name="name" xmlname="NAME"> - <Constraint/> - <Editor/> - </XModelAttribute> + <XModelAttribute name="name" xmlname="NAME"/> <XModelAttribute default="properties" name="extension" visibility="false" xmlname="EXTENSION"> - <Constraint/> <Editor name="Uneditable"/> </XModelAttribute> </XModelAttributes> @@ -405,23 +376,12 @@ <XModelAttributes> <XModelAttribute default="file" loader="ElementType" name="element type" visibility="false"> - <Constraint/> <Editor name="Uneditable"/> </XModelAttribute> - <XModelAttribute name="name" xmlname="NAME"> - <Constraint/> - <Editor/> - </XModelAttribute> - <XModelAttribute TRIM="no" name="body" visibility="false"> - <Constraint/> - <Editor/> - </XModelAttribute> - <XModelAttribute TRIM="no" name="extension" xmlname="EXTENSION"> - <Constraint/> - <Editor/> - </XModelAttribute> + <XModelAttribute name="name" xmlname="NAME"/> + <XModelAttribute TRIM="no" name="body" visibility="false"/> + <XModelAttribute TRIM="no" name="extension" xmlname="EXTENSION"/> <XModelAttribute loader="ElementType" name="_lateload" visibility="false"> - <Constraint/> <Editor name="Uneditable"/> </XModelAttribute> </XModelAttributes> @@ -498,17 +458,10 @@ <XModelAttributes> <XModelAttribute default="html" loader="ElementType" name="element type" visibility="false"> - <Constraint/> <Editor name="Uneditable"/> </XModelAttribute> - <XModelAttribute name="name" xmlname="NAME"> - <Constraint/> - <Editor/> - </XModelAttribute> - <XModelAttribute TRIM="no" name="body" visibility="false"> - <Constraint/> - <Editor/> - </XModelAttribute> + <XModelAttribute name="name" xmlname="NAME"/> + <XModelAttribute TRIM="no" name="body" visibility="false"/> <XModelAttribute default="xhtml" name="extension" xmlname="EXTENSION"> <Constraint loader="List"> <value name="html"/> @@ -517,7 +470,6 @@ <Editor name="List"/> </XModelAttribute> <XModelAttribute loader="ElementType" name="_lateload" visibility="false"> - <Constraint/> <Editor name="Uneditable"/> </XModelAttribute> </XModelAttributes> @@ -596,23 +548,14 @@ <XModelAttributes> <XModelAttribute default="folder" loader="ElementType" name="element type" visibility="false"> - <Constraint/> <Editor name="Uneditable"/> </XModelAttribute> - <XModelAttribute name="name" xmlname="NAME"> - <Constraint/> - <Editor/> - </XModelAttribute> - <XModelAttribute TRIM="no" name="body" visibility="false"> - <Constraint/> - <Editor/> - </XModelAttribute> + <XModelAttribute name="name" xmlname="NAME"/> + <XModelAttribute TRIM="no" name="body" visibility="false"/> <XModelAttribute default="xsl" name="extension" xmlname="EXTENSION"> - <Constraint/> <Editor name="Uneditable"/> </XModelAttribute> <XModelAttribute loader="ElementType" name="_lateload" visibility="false"> - <Constraint/> <Editor name="Uneditable"/> </XModelAttribute> </XModelAttributes> @@ -669,13 +612,9 @@ <Editor name="ContainerChooser"/> </XModelAttribute> <XModelAttribute name="separator"> - <Constraint/> <Editor name="Separator"/> </XModelAttribute> - <XModelAttribute name="name"> - <Constraint/> - <Editor/> - </XModelAttribute> + <XModelAttribute name="name"/> <XModelAttribute name="template"> <Constraint loader="ListString"/> <Editor name="ListString"/> @@ -710,32 +649,17 @@ </XEntityRenderer> <XModelAttributes> <XModelAttribute default="property" loader="ElementType" name="element type"> - <Constraint/> <Editor name="Uneditable"/> </XModelAttribute> - <XModelAttribute name="name" xmlname="NAME"> - <Constraint/> - <Editor/> - </XModelAttribute> - <XModelAttribute name="dirtyname" visibility="false"> - <Constraint/> - <Editor/> - </XModelAttribute> - <XModelAttribute TRIM="no" name="value" xmlname="VALUE"> - <Constraint/> - <Editor/> - </XModelAttribute> - <XModelAttribute name="dirtyvalue" visibility="false"> - <Constraint/> - <Editor/> - </XModelAttribute> + <XModelAttribute name="name" xmlname="NAME"/> + <XModelAttribute name="dirtyname" visibility="false"/> + <XModelAttribute TRIM="no" name="value" xmlname="VALUE"/> + <XModelAttribute name="dirtyvalue" visibility="false"/> <XModelAttribute TRIM="no" default="#" name="separator" visibility="false" xmlname="SEPARATOR"> - <Constraint/> <Editor name="Uneditable"/> </XModelAttribute> <XModelAttribute TRIM="no" name="comments" visibility="false" xmlname="COMMENTS"> - <Constraint/> <Editor name="Note"/> </XModelAttribute> <XModelAttribute default="yes" name="enabled" visibility="false" xmlname="ENABLED"> @@ -745,14 +669,8 @@ </Constraint> <Editor name="CheckBox"/> </XModelAttribute> - <XModelAttribute default="=" name="name-value-separator" visibility="false"> - <Constraint/> - <Editor/> - </XModelAttribute> - <XModelAttribute default="\r\n" name="line-end" visibility="false" xmlname="line-end"> - <Constraint/> - <Editor/> - </XModelAttribute> + <XModelAttribute default="=" name="name-value-separator" visibility="false"/> + <XModelAttribute default="\r\n" name="line-end" visibility="false" xmlname="line-end"/> </XModelAttributes> <XActionItem kind="list"> <XActionItem ICON="action.copy" displayName="Copy" kind="list" name="CopyActions"> Added: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/files/handlers/InvokingWizardHandler.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/files/handlers/InvokingWizardHandler.java (rev 0) +++ trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/files/handlers/InvokingWizardHandler.java 2007-12-12 16:26:10 UTC (rev 5262) @@ -0,0 +1,51 @@ +package org.jboss.tools.common.model.files.handlers; + +import java.util.Properties; + +import org.jboss.tools.common.meta.action.SpecialWizard; +import org.jboss.tools.common.meta.action.SpecialWizardFactory; +import org.jboss.tools.common.meta.action.XActionInvoker; +import org.jboss.tools.common.meta.action.impl.AbstractHandler; +import org.jboss.tools.common.model.XModelObject; + +public class InvokingWizardHandler extends AbstractHandler { + SpecialWizard sw = SpecialWizardFactory.createSpecialWizard("org.jboss.tools.common.model.ui.wizard.newfile.WizardInvoker"); + + public InvokingWizardHandler() {} + + public boolean isEnabled(XModelObject object) { + return sw != null && object != null; + } + + public void executeHandler(XModelObject object, Properties p) throws Exception { + if(sw == null || object == null) return; + if(p == null) p = new Properties(); + String pluginId = action.getProperty("plugin"); + String wizardId = action.getProperty("wizard"); + + p.setProperty("plugin", pluginId); + p.setProperty("wizard", wizardId); + p.put("object", object); + + sw.setObject(p); + int r = sw.execute(); + // Returns 1 if wizard was not found. + if(r == 1) { + String path = getTruePath(); + if(path != null) XActionInvoker.invoke(path, object, p); + } + } + + private String getTruePath() { + String path = action.getProperty("action"); + if(path != null) return path; + path = action.getPath(); + if(path.endsWith("V")) { + path = path.substring(0, path.length() - 1).replace('/', '.'); + } else { + path = null; + } + return path; + } + +}

18 years

1
0
0 / 0

JBoss Tools SVN: r5261 - trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/ui/veditor/editors/model.

by jbosstools-commits＠lists.jboss.org

Author: achabatar Date: 2007-12-12 10:07:22 -0500 (Wed, 12 Dec 2007) New Revision: 5261 Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/ui/veditor/editors/model/Shape.java Log: http://jira.jboss.com/jira/browse/JBIDE-1417 Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/ui/veditor/editors/model/Shape.java =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/ui/veditor/editors/model/Shape.java 2007-12-12 14:50:49 UTC (rev 5260) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/ui/veditor/editors/model/Shape.java 2007-12-12 15:07:22 UTC (rev 5261) @@ -16,7 +16,9 @@ import org.eclipse.ui.views.properties.IPropertyDescriptor; import org.eclipse.ui.views.properties.TextPropertyDescriptor; import org.hibernate.mapping.Column; +import org.hibernate.mapping.Component; import org.hibernate.mapping.Property; +import org.hibernate.mapping.Value; import org.jboss.tools.hibernate.ui.view.views.HibernateUtils; import org.jboss.tools.hibernate.ui.view.views.OrmModelNameVisitor; @@ -179,6 +181,8 @@ } else if (PROPERTY_TYPE.equals(propertyId)) { if (getOrmElement() instanceof Property) { + Value value = ((Property) getOrmElement()).getValue(); + if (value instanceof Component) return ((Property) getOrmElement()).getValue().toString(); return ((Property) getOrmElement()).getType().getReturnedClass().getName(); } else if (getOrmElement() instanceof Column) {

18 years

1
0
0 / 0

JBoss Tools SVN: r5260 - in trunk/jbpm/docs: resources and 3 other directories.

by jbosstools-commits＠lists.jboss.org

Author: afedosik Date: 2007-12-12 09:50:49 -0500 (Wed, 12 Dec 2007) New Revision: 5260 Added: trunk/jbpm/docs/resources/support/lib/avalon-framework-4.2.0.jar trunk/jbpm/docs/resources/support/lib/batik-all-1.6.jar trunk/jbpm/docs/resources/support/lib/commons-io-1.3.1.jar trunk/jbpm/docs/resources/support/lib/commons-logging-1.0.4.jar trunk/jbpm/docs/resources/support/lib/fop-hyph.jar trunk/jbpm/docs/resources/support/lib/fop-sandbox.jar trunk/jbpm/docs/resources/support/lib/fop-transcoder-allinone.jar trunk/jbpm/docs/resources/support/lib/fop-transcoder.jar trunk/jbpm/docs/resources/support/lib/serializer-2.7.0.jar trunk/jbpm/docs/resources/support/lib/servlet-2.2.jar trunk/jbpm/docs/resources/support/lib/xalan-2.7.0.jar trunk/jbpm/docs/resources/support/lib/xercesImpl-2.7.1.jar trunk/jbpm/docs/resources/support/lib/xml-apis-1.3.02.jar trunk/jbpm/docs/resources/support/lib/xmlgraphics-commons-1.2.jar Removed: trunk/jbpm/docs/resources/support/lib/avalon-framework-cvs-20020806.jar trunk/jbpm/docs/resources/support/lib/batik.jar Modified: trunk/jbpm/docs/reference/en/modules/Test_Drive_Proc.xml trunk/jbpm/docs/reference/en/modules/The_JBoss_jBPM_Int_Mech.xml trunk/jbpm/docs/reference/en/modules/guided_tour_jboss_jbpmgpd.xml trunk/jbpm/docs/resources/styles/en/fopdf.xsl trunk/jbpm/docs/resources/support.xml trunk/jbpm/docs/resources/support/docbook-xsl/html/param.xsl trunk/jbpm/docs/resources/support/lib/fop.jar Log: http://jira.jboss.com/jira/browse/JBDS-5 FOP updated to fop-0.94 version, screenshots for pdf version are fixed. "scale" attribute added for wide images. Modified: trunk/jbpm/docs/reference/en/modules/Test_Drive_Proc.xml =================================================================== --- trunk/jbpm/docs/reference/en/modules/Test_Drive_Proc.xml 2007-12-12 14:32:09 UTC (rev 5259) +++ trunk/jbpm/docs/reference/en/modules/Test_Drive_Proc.xml 2007-12-12 14:50:49 UTC (rev 5260) @@ -44,7 +44,7 @@ <mediaobject> <imageobject> - <imagedata fileref="images/Test_Drive_Proc/test_driv_proc_1.png" scalefit="1"/> + <imagedata fileref="images/Test_Drive_Proc/test_driv_proc_1.png"/> </imageobject> </mediaobject> </figure> @@ -58,7 +58,7 @@ <mediaobject> <imageobject> - <imagedata fileref="images/Test_Drive_Proc/test_driv_proc_2.png" scalefit="1"/> + <imagedata fileref="images/Test_Drive_Proc/test_driv_proc_2.png"/> </imageobject> </mediaobject> </figure> @@ -71,7 +71,7 @@ <mediaobject> <imageobject> - <imagedata fileref="images/Test_Drive_Proc/test_driv_proc_3.png" scalefit="1"/> + <imagedata fileref="images/Test_Drive_Proc/test_driv_proc_3.png" scale="75"/> </imageobject> </mediaobject> </figure> @@ -96,7 +96,7 @@ <mediaobject> <imageobject> - <imagedata fileref="images/Test_Drive_Proc/test_driv_proc_4.png" scalefit="1"/> + <imagedata fileref="images/Test_Drive_Proc/test_driv_proc_4.png" scale="75"/> </imageobject> </mediaobject> </figure> @@ -107,7 +107,7 @@ <mediaobject> <imageobject> - <imagedata fileref="images/Test_Drive_Proc/test_driv_proc_5.png" scalefit="1"/> + <imagedata fileref="images/Test_Drive_Proc/test_driv_proc_5.png" scale="75"/> </imageobject> </mediaobject> </figure> Modified: trunk/jbpm/docs/reference/en/modules/The_JBoss_jBPM_Int_Mech.xml =================================================================== --- trunk/jbpm/docs/reference/en/modules/The_JBoss_jBPM_Int_Mech.xml 2007-12-12 14:32:09 UTC (rev 5259) +++ trunk/jbpm/docs/reference/en/modules/The_JBoss_jBPM_Int_Mech.xml 2007-12-12 14:50:49 UTC (rev 5260) @@ -35,8 +35,7 @@ <mediaobject> <imageobject> - <imagedata fileref="images/The_JBoss_jBPM_Int_Mech/jboss_jbpm_int_mech_1.png" - scalefit="1"/> + <imagedata fileref="images/The_JBoss_jBPM_Int_Mech/jboss_jbpm_int_mech_1.png"/> </imageobject> </mediaobject> </figure> @@ -58,8 +57,7 @@ <mediaobject> <imageobject> - <imagedata fileref="images/The_JBoss_jBPM_Int_Mech/jboss_jbpm_int_mech_2.png" - scalefit="1"/> + <imagedata fileref="images/The_JBoss_jBPM_Int_Mech/jboss_jbpm_int_mech_2.png" scale="75"/> </imageobject> </mediaobject> </figure> @@ -87,8 +85,7 @@ <mediaobject> <imageobject> - <imagedata fileref="images/The_JBoss_jBPM_Int_Mech/jboss_jbpm_int_mech_3.png" - scalefit="1"/> + <imagedata fileref="images/The_JBoss_jBPM_Int_Mech/jboss_jbpm_int_mech_3.png" scale="75"/> </imageobject> </mediaobject> </figure> @@ -102,8 +99,7 @@ <mediaobject> <imageobject> - <imagedata fileref="images/The_JBoss_jBPM_Int_Mech/jboss_jbpm_int_mech_4.png" - scalefit="1"/> + <imagedata fileref="images/The_JBoss_jBPM_Int_Mech/jboss_jbpm_int_mech_4.png" scale="75"/> </imageobject> </mediaobject> </figure> @@ -120,8 +116,7 @@ <mediaobject> <imageobject> - <imagedata fileref="images/The_JBoss_jBPM_Int_Mech/jboss_jbpm_int_mech_5.png" - scalefit="1"/> + <imagedata fileref="images/The_JBoss_jBPM_Int_Mech/jboss_jbpm_int_mech_5.png"/> </imageobject> </mediaobject> </figure> @@ -133,8 +128,7 @@ <mediaobject> <imageobject> - <imagedata fileref="images/The_JBoss_jBPM_Int_Mech/jboss_jbpm_int_mech_6.png" - scalefit="1"/> + <imagedata fileref="images/The_JBoss_jBPM_Int_Mech/jboss_jbpm_int_mech_6.png"/> </imageobject> </mediaobject> </figure> @@ -149,8 +143,7 @@ <mediaobject> <imageobject> - <imagedata fileref="images/The_JBoss_jBPM_Int_Mech/jboss_jbpm_int_mech_7.png" - scalefit="1"/> + <imagedata fileref="images/The_JBoss_jBPM_Int_Mech/jboss_jbpm_int_mech_7.png" scale="75"/> </imageobject> </mediaobject> </figure> @@ -166,8 +159,7 @@ <mediaobject> <imageobject> - <imagedata fileref="images/The_JBoss_jBPM_Int_Mech/jboss_jbpm_int_mech_8.png" - scalefit="1"/> + <imagedata fileref="images/The_JBoss_jBPM_Int_Mech/jboss_jbpm_int_mech_8.png"/> </imageobject> </mediaobject> </figure> @@ -182,8 +174,7 @@ <mediaobject> <imageobject> - <imagedata fileref="images/The_JBoss_jBPM_Int_Mech/jboss_jbpm_int_mech_10.png" - scalefit="1"/> + <imagedata fileref="images/The_JBoss_jBPM_Int_Mech/jboss_jbpm_int_mech_10.png" scale="75"/> </imageobject> </mediaobject> </figure> Modified: trunk/jbpm/docs/reference/en/modules/guided_tour_jboss_jbpmgpd.xml =================================================================== --- trunk/jbpm/docs/reference/en/modules/guided_tour_jboss_jbpmgpd.xml 2007-12-12 14:32:09 UTC (rev 5259) +++ trunk/jbpm/docs/reference/en/modules/guided_tour_jboss_jbpmgpd.xml 2007-12-12 14:50:49 UTC (rev 5260) @@ -116,7 +116,7 @@ <title>The Process Definition Editor</title> <mediaobject> <imageobject> - <imagedata fileref="images/guided_tour_jboss_jbpmgpd/guided_tour6.png"/> + <imagedata fileref="images/guided_tour_jboss_jbpmgpd/guided_tour6.png" scale="75"/> </imageobject> </mediaobject> </figure> @@ -161,7 +161,7 @@ <title>A Simple Process With Three Nodes</title> <mediaobject> <imageobject> - <imagedata fileref="images/guided_tour_jboss_jbpmgpd/guided_tour7.png"/> + <imagedata fileref="images/guided_tour_jboss_jbpmgpd/guided_tour7.png" scale="75"/> </imageobject> </mediaobject> </figure> @@ -185,7 +185,7 @@ <title>A Simple Process With Transitions</title> <mediaobject> <imageobject> - <imagedata fileref="images/guided_tour_jboss_jbpmgpd/guided_tour8.png"/> + <imagedata fileref="images/guided_tour_jboss_jbpmgpd/guided_tour8.png" scale="75"/> </imageobject> </mediaobject> </figure> @@ -205,7 +205,7 @@ <title>The Outline and Overview Views</title> <mediaobject> <imageobject> - <imagedata fileref="images/guided_tour_jboss_jbpmgpd/guided_tour9.png"/> + <imagedata fileref="images/guided_tour_jboss_jbpmgpd/guided_tour9.png" scale="75"/> </imageobject> </mediaobject> </figure> Modified: trunk/jbpm/docs/resources/styles/en/fopdf.xsl =================================================================== --- trunk/jbpm/docs/resources/styles/en/fopdf.xsl 2007-12-12 14:32:09 UTC (rev 5259) +++ trunk/jbpm/docs/resources/styles/en/fopdf.xsl 2007-12-12 14:50:49 UTC (rev 5260) @@ -112,7 +112,7 @@ <xsl:variable name="Version"> <xsl:choose> <xsl:when test="//releaseinfo"> - <xsl:text>JBoss </xsl:text> + <xsl:text></xsl:text> <xsl:value-of select="//releaseinfo"/> </xsl:when> <xsl:otherwise> @@ -215,7 +215,7 @@ <xsl:param name="tablecolumns.extension">0</xsl:param>  - <xsl:param name="fop.extensions">1</xsl:param> + <xsl:param name="fop1.extensions">1</xsl:param> Modified: trunk/jbpm/docs/resources/support/docbook-xsl/html/param.xsl =================================================================== --- trunk/jbpm/docs/resources/support/docbook-xsl/html/param.xsl 2007-12-12 14:32:09 UTC (rev 5259) +++ trunk/jbpm/docs/resources/support/docbook-xsl/html/param.xsl 2007-12-12 14:50:49 UTC (rev 5260) @@ -262,7 +262,7 @@ <xsl:param name="index.term.separator"/> <xsl:param name="index.range.separator"/> <xsl:param name="index.prefer.titleabbrev" select="0"/> -<xsl:param name="ignore.image.scaling" select="0"/> +<xsl:param name="ignore.image.scaling" select="1"/> <xsl:param name="inherit.keywords" select="1"/> <xsl:param name="insert.xref.page.number">no</xsl:param> <xsl:param name="javahelp.encoding">iso-8859-1</xsl:param> Added: trunk/jbpm/docs/resources/support/lib/avalon-framework-4.2.0.jar =================================================================== (Binary files differ) Property changes on: trunk/jbpm/docs/resources/support/lib/avalon-framework-4.2.0.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Deleted: trunk/jbpm/docs/resources/support/lib/avalon-framework-cvs-20020806.jar =================================================================== (Binary files differ) Added: trunk/jbpm/docs/resources/support/lib/batik-all-1.6.jar =================================================================== (Binary files differ) Property changes on: trunk/jbpm/docs/resources/support/lib/batik-all-1.6.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Deleted: trunk/jbpm/docs/resources/support/lib/batik.jar =================================================================== (Binary files differ) Added: trunk/jbpm/docs/resources/support/lib/commons-io-1.3.1.jar =================================================================== (Binary files differ) Property changes on: trunk/jbpm/docs/resources/support/lib/commons-io-1.3.1.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/jbpm/docs/resources/support/lib/commons-logging-1.0.4.jar =================================================================== (Binary files differ) Property changes on: trunk/jbpm/docs/resources/support/lib/commons-logging-1.0.4.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/jbpm/docs/resources/support/lib/fop-hyph.jar =================================================================== (Binary files differ) Property changes on: trunk/jbpm/docs/resources/support/lib/fop-hyph.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/jbpm/docs/resources/support/lib/fop-sandbox.jar =================================================================== (Binary files differ) Property changes on: trunk/jbpm/docs/resources/support/lib/fop-sandbox.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/jbpm/docs/resources/support/lib/fop-transcoder-allinone.jar =================================================================== (Binary files differ) Property changes on: trunk/jbpm/docs/resources/support/lib/fop-transcoder-allinone.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/jbpm/docs/resources/support/lib/fop-transcoder.jar =================================================================== (Binary files differ) Property changes on: trunk/jbpm/docs/resources/support/lib/fop-transcoder.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Modified: trunk/jbpm/docs/resources/support/lib/fop.jar =================================================================== (Binary files differ) Added: trunk/jbpm/docs/resources/support/lib/serializer-2.7.0.jar =================================================================== (Binary files differ) Property changes on: trunk/jbpm/docs/resources/support/lib/serializer-2.7.0.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/jbpm/docs/resources/support/lib/servlet-2.2.jar =================================================================== (Binary files differ) Property changes on: trunk/jbpm/docs/resources/support/lib/servlet-2.2.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/jbpm/docs/resources/support/lib/xalan-2.7.0.jar =================================================================== (Binary files differ) Property changes on: trunk/jbpm/docs/resources/support/lib/xalan-2.7.0.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/jbpm/docs/resources/support/lib/xercesImpl-2.7.1.jar =================================================================== (Binary files differ) Property changes on: trunk/jbpm/docs/resources/support/lib/xercesImpl-2.7.1.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/jbpm/docs/resources/support/lib/xml-apis-1.3.02.jar =================================================================== (Binary files differ) Property changes on: trunk/jbpm/docs/resources/support/lib/xml-apis-1.3.02.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/jbpm/docs/resources/support/lib/xmlgraphics-commons-1.2.jar =================================================================== (Binary files differ) Property changes on: trunk/jbpm/docs/resources/support/lib/xmlgraphics-commons-1.2.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Modified: trunk/jbpm/docs/resources/support.xml =================================================================== --- trunk/jbpm/docs/resources/support.xml 2007-12-12 14:32:09 UTC (rev 5259) +++ trunk/jbpm/docs/resources/support.xml 2007-12-12 14:50:49 UTC (rev 5260) @@ -37,6 +37,15 @@ </fileset> </path> + <property name="fop.home" value="${support.dir}/lib"/> + + <taskdef name="fop" + classname="org.apache.fop.tools.anttasks.Fop"> + <classpath refid="lib.classpath"> + + </classpath> + </taskdef> +  <target name="all.doc" depends="clean"> @@ -141,14 +150,24 @@ </xslt> -->  - <java classname="org.apache.fop.apps.Fop" + + <fop format="application/pdf" + basedir="${build.dir}/${lang}/pdf" + outfile="${build.dir}/${lang}/pdf/${pdf.name}" + fofile="${build.dir}/${lang}/pdf/docbook_fop.tmp" + messagelevel="debug"> + + </fop> + +  <delete file="${build.dir}/${lang}/pdf/docbook_fop.tmp"/> <delete dir="${build.dir}/${lang}/pdf/images"/>

18 years

1
0
0 / 0

JBoss Tools SVN: r5259 - in trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/ui/veditor/editors: actions and 1 other directory.

by jbosstools-commits＠lists.jboss.org

Author: dgeraskov Date: 2007-12-12 09:32:09 -0500 (Wed, 12 Dec 2007) New Revision: 5259 Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/ui/veditor/editors/VisualEditor.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/ui/veditor/editors/actions/OpenMappingAction.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/ui/veditor/editors/actions/OpenSourceAction.java Log: http://jira.jboss.com/jira/browse/JBIDE-1412 Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/ui/veditor/editors/VisualEditor.java =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/ui/veditor/editors/VisualEditor.java 2007-12-12 14:32:04 UTC (rev 5258) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/ui/veditor/editors/VisualEditor.java 2007-12-12 14:32:09 UTC (rev 5259) @@ -32,6 +32,7 @@ import org.eclipse.ui.actions.ActionFactory; import org.eclipse.ui.views.contentoutline.IContentOutlinePage; import org.hibernate.console.ConsoleConfiguration; +import org.hibernate.mapping.Column; import org.hibernate.mapping.RootClass; import org.jboss.tools.hibernate.ui.veditor.editors.actions.OpenMappingAction; import org.jboss.tools.hibernate.ui.veditor.editors.actions.OpenSourceAction; @@ -145,8 +146,8 @@ return super.getAdapter(type); } - - public Set getSelectedElements() { + + public Set getSelectedElements_old() { Set ret = new HashSet(); List selectedEditParts = getGraphicalViewer().getSelectedEditParts(); Iterator iterator = selectedEditParts.iterator(); @@ -164,6 +165,24 @@ return ret; } + public Set getSelectedElements() { + Set ret = new HashSet(); + List selectedEditParts = getGraphicalViewer().getSelectedEditParts(); + Iterator iterator = selectedEditParts.iterator(); + while (iterator.hasNext()) { + Object elem = iterator.next(); + if (elem instanceof OrmEditPart) { + Shape shape = (Shape)((OrmEditPart)elem).getModel(); + Object ormElement = shape.getOrmElement(); + if (ormElement instanceof Column){ + shape = (Shape) shape.getParent(); + } + ret.add(shape.getOrmElement()); + } + } + return ret; + } + public OrmDiagram getViewerContents() { return ormDiagram; } Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/ui/veditor/editors/actions/OpenMappingAction.java =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/ui/veditor/editors/actions/OpenMappingAction.java 2007-12-12 14:32:04 UTC (rev 5258) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/ui/veditor/editors/actions/OpenMappingAction.java 2007-12-12 14:32:09 UTC (rev 5259) @@ -3,25 +3,20 @@ import java.util.Iterator; import java.util.Set; -import org.eclipse.core.resources.IResource; import org.eclipse.gef.ui.actions.SelectionAction; import org.eclipse.jdt.core.IJavaProject; -import org.eclipse.jdt.core.JavaModelException; import org.eclipse.ui.IWorkbenchPart; -import org.eclipse.ui.PartInitException; import org.hibernate.console.ConsoleConfiguration; -import org.hibernate.eclipse.console.actions.OpenFileActionUtils; -import org.hibernate.mapping.Collection; import org.hibernate.mapping.PersistentClass; -import org.hibernate.mapping.RootClass; -import org.hibernate.mapping.Subclass; -import org.hibernate.mapping.Table; -import org.jboss.tools.hibernate.ui.veditor.VisualEditorPlugin; +import org.hibernate.mapping.Property; import org.jboss.tools.hibernate.ui.veditor.editors.VisualEditor; import org.jboss.tools.hibernate.ui.veditor.editors.model.SpecialRootClass; -import org.jboss.tools.hibernate.ui.view.views.HibernateUtils; import org.jboss.tools.hibernate.ui.view.views.ObjectEditorInput; +/** + * @author Dmitry Geraskov + * + */ public class OpenMappingAction extends SelectionAction { public static String ACTION_ID = "org.jboss.tools.hibernate.ui.veditor.editors.actions.open.mapping"; @@ -34,17 +29,30 @@ public void run() { ObjectEditorInput objectEditorInput = (ObjectEditorInput)((VisualEditor)getWorkbenchPart()).getEditorInput(); ConsoleConfiguration consoleConfiguration = objectEditorInput.getConfiguration(); - java.io.File configXMLFile = consoleConfiguration.getPreferences().getConfigXMLFile(); - IJavaProject proj = objectEditorInput.getJavaProject(); + //java.io.File configXMLFile = consoleConfiguration.getPreferences().getConfigXMLFile(); + //IJavaProject proj = objectEditorInput.getJavaProject(); VisualEditor part = (VisualEditor)getWorkbenchPart(); Set selectedElements = part.getSelectedElements(); Iterator iterator = selectedElements.iterator(); while (iterator.hasNext()) { - Object selectedElement = iterator.next(); - - IResource resource = null; + Object selection = iterator.next(); + if (selection instanceof Property + && ((Property)selection).getPersistentClass() instanceof SpecialRootClass){ + Property compositSel = ((Property)selection); + Property parentProperty = ((SpecialRootClass)((Property)selection).getPersistentClass()).getProperty(); + org.hibernate.eclipse.console.actions.OpenMappingAction.run(compositSel, parentProperty, consoleConfiguration); + continue; + } + if (selection instanceof SpecialRootClass) { + selection = ((SpecialRootClass)selection).getProperty(); + } + org.hibernate.eclipse.console.actions.OpenMappingAction.run(selection, consoleConfiguration); + + + /*IResource resource = null; + Object selectedElement = selection; if (selectedElement instanceof RootClass) { RootClass rootClass = (RootClass)selectedElement; @@ -105,11 +113,16 @@ if (resource != null) { try { - OpenFileActionUtils.openEditor(VisualEditorPlugin.getPage(), resource); - } catch (PartInitException e) { + IEditorPart editorPart = OpenFileActionUtils.openEditor(VisualEditorPlugin.getPage(), resource); + if (selectedElement instanceof PersistentClass + || (selectedElement instanceof Property + && ((Property)selectedElement).getPersistentClass() != null)){ + org.hibernate.eclipse.console.actions.OpenMappingAction.applySelectionToEditor(selectedElement, editorPart); + } + } catch (PartInitException e) { VisualEditorPlugin.getDefault().logInfo("Can't open mapping file", e); } - } + }*/ } } Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/ui/veditor/editors/actions/OpenSourceAction.java =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/ui/veditor/editors/actions/OpenSourceAction.java 2007-12-12 14:32:04 UTC (rev 5258) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/ui/veditor/editors/actions/OpenSourceAction.java 2007-12-12 14:32:09 UTC (rev 5259) @@ -3,27 +3,21 @@ import java.util.Iterator; import java.util.Set; -import org.eclipse.core.resources.IFile; import org.eclipse.core.resources.IResource; import org.eclipse.gef.ui.actions.SelectionAction; import org.eclipse.jdt.core.IJavaProject; -import org.eclipse.jdt.core.IType; -import org.eclipse.jdt.core.JavaModelException; -import org.eclipse.jface.dialogs.MessageDialog; import org.eclipse.ui.IWorkbenchPart; -import org.eclipse.ui.PartInitException; import org.hibernate.console.ConsoleConfiguration; -import org.hibernate.eclipse.console.actions.OpenFileActionUtils; import org.hibernate.mapping.PersistentClass; -import org.hibernate.mapping.RootClass; -import org.jboss.tools.hibernate.ui.veditor.VisualEditorPlugin; +import org.hibernate.mapping.Property; import org.jboss.tools.hibernate.ui.veditor.editors.VisualEditor; -import org.jboss.tools.hibernate.ui.veditor.editors.model.OrmDiagram; -import org.jboss.tools.hibernate.ui.view.ViewPlugin; import org.jboss.tools.hibernate.ui.view.views.HibernateUtils; import org.jboss.tools.hibernate.ui.view.views.ObjectEditorInput; -import org.hibernate.eclipse.console.actions.OpenFileActionUtils; +/** + * @author Dmitry Geraskov + * + */ public class OpenSourceAction extends SelectionAction { public static String ACTION_ID = "org.jboss.tools.hibernate.ui.veditor.editors.actions.open.source"; @@ -43,30 +37,21 @@ Iterator iterator = selectedElements.iterator(); while (iterator.hasNext()) { - PersistentClass rootClass = (PersistentClass) iterator.next(); - + //PersistentClass rootClass = (PersistentClass) iterator.next(); + Object selection = iterator.next(); + PersistentClass rootClass = null; + if (selection instanceof PersistentClass) { + rootClass = (PersistentClass) selection; + } else if (selection instanceof Property) { + rootClass = ((Property) selection).getPersistentClass(); + } else continue; + IResource resource = null; String fullyQualifiedName = HibernateUtils.getPersistentClassName(rootClass); if (fullyQualifiedName.indexOf("$") > 0) { fullyQualifiedName = fullyQualifiedName.substring(0, fullyQualifiedName.indexOf("$")); } - try { - IType type = proj.findType(fullyQualifiedName); - if (type != null) resource = type.getResource(); - } catch (JavaModelException e) { - VisualEditorPlugin.getDefault().logError("Can't find source file.", e); - } - - if (resource instanceof IFile){ - try { - OpenFileActionUtils.openEditor(ViewPlugin.getPage(), (IFile) resource); - } catch (PartInitException e) { - VisualEditorPlugin.getDefault().logError("Can't open source file.", e); - } - } - if (resource == null) { - MessageDialog.openInformation(VisualEditorPlugin.getShell(), "Open Source File", "Source file for class '" + fullyQualifiedName + "' not found."); - } + new org.hibernate.eclipse.console.actions.OpenSourceAction().run(selection, proj, fullyQualifiedName); } } @@ -76,7 +61,8 @@ Iterator iterator = selectedElements.iterator(); while (iterator.hasNext()) { Object elem = iterator.next(); - if (elem instanceof PersistentClass) return true; + if (elem instanceof PersistentClass + || elem instanceof Property) return true; } return false; }

18 years

1
0
0 / 0

JBoss Tools SVN: r5258 - in trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console: views and 1 other directory.

by jbosstools-commits＠lists.jboss.org

Author: dgeraskov Date: 2007-12-12 09:32:04 -0500 (Wed, 12 Dec 2007) New Revision: 5258 Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/actions/OpenMappingAction.java trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/actions/OpenSourceAction.java trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/views/ConfigurationsViewActionGroup.java trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/views/KnownConfigurationsView.java Log: http://jira.jboss.com/jira/browse/JBIDE-1412 Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/actions/OpenMappingAction.java =================================================================== --- trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/actions/OpenMappingAction.java 2007-12-12 13:14:07 UTC (rev 5257) +++ trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/actions/OpenMappingAction.java 2007-12-12 14:32:04 UTC (rev 5258) @@ -46,11 +46,31 @@ if (sel instanceof TreeSelection){ TreePath path = ((TreeSelection)sel).getPaths()[0]; ConsoleConfiguration consoleConfiguration = (ConsoleConfiguration)(path.getSegment(0)); - run(path.getLastSegment(), consoleConfiguration); - } + run(path, consoleConfiguration); + } } - public void run(Object selection, ConsoleConfiguration consoleConfiguration) { + public static void run(TreePath path, ConsoleConfiguration consoleConfiguration) { + boolean isPropertySel = (path.getLastSegment() instanceof Property); + if (isPropertySel){ + Property propertySel = (Property)path.getLastSegment(); + PersistentClass persClass = propertySel.getPersistentClass(); + if ( persClass == null + || (RootClass.class.isAssignableFrom(persClass.getClass()) + && persClass.getClass() != RootClass.class)){ + Property parentProp = (Property)path.getParentPath().getLastSegment(); + run(propertySel, parentProp, consoleConfiguration); + return; + } + } + run(path.getLastSegment(), consoleConfiguration); + } + + /** + * @param selection + * @param consoleConfiguration + */ + public static void run(Object selection, ConsoleConfiguration consoleConfiguration) { IEditorPart editorPart = null; if (selection instanceof Property){ Property p = (Property)selection; @@ -60,12 +80,43 @@ } else { editorPart = openMapping(selection, consoleConfiguration); } - + applySelectionToEditor(selection, editorPart); + } + + /** + * @param compositeProperty + * @param parentProperty + * @param consoleConfiguration + */ + public static void run(Property compositeProperty, Property parentProperty, ConsoleConfiguration consoleConfiguration) { + if (parentProperty.getPersistentClass() == null) return; + IEditorPart editorPart = openMapping(parentProperty.getPersistentClass(), consoleConfiguration); + ITextEditor textEditor = getTextEditor(editorPart); + if (textEditor == null) return; + textEditor.selectAndReveal(0, 0); + FindReplaceDocumentAdapter findAdapter = getFindDocAdapter(textEditor); + IRegion parentRegion = findSelection(parentProperty, findAdapter); + if (parentRegion == null) return; + try { + IRegion propRegion = findAdapter.find(parentRegion.getOffset()+parentRegion.getLength(), generatePattern(compositeProperty), true, true, false, true); + if (propRegion != null){ + textEditor.selectAndReveal(propRegion.getOffset(), propRegion.getLength()); + } + } catch (BadLocationException e) { + return; + } + } + + /** + * @param selection + * @param editorPart + */ + static public void applySelectionToEditor(Object selection, IEditorPart editorPart) { Assert.isNotNull(editorPart); ITextEditor textEditor = getTextEditor(editorPart); if (textEditor == null) return; - IDocument document = textEditor.getDocumentProvider().getDocument(textEditor.getEditorInput()); - FindReplaceDocumentAdapter findAdapter = new FindReplaceDocumentAdapter(document); + textEditor.selectAndReveal(0, 0); + FindReplaceDocumentAdapter findAdapter = getFindDocAdapter(textEditor); IRegion selectRegion = null; if (selection instanceof RootClass @@ -80,6 +131,17 @@ } } + /** + * @param textEditor + * @return + */ + private static FindReplaceDocumentAdapter getFindDocAdapter( + ITextEditor textEditor) { + IDocument document = textEditor.getDocumentProvider().getDocument(textEditor.getEditorInput()); + FindReplaceDocumentAdapter findAdapter = new FindReplaceDocumentAdapter(document); + return findAdapter; + } + static public IEditorPart openMapping(Object selElement, ConsoleConfiguration consoleConfiguration) { IJavaProject proj = ProjectUtils.findJavaProject(consoleConfiguration); @@ -186,7 +248,8 @@ private static String generatePattern(Property property){ Cfg2HbmTool tool = new Cfg2HbmTool(); StringBuilder pattern = new StringBuilder("<"); - if(property.getPersistentClass().getIdentifierProperty()==property) { + if(property.getPersistentClass() != null && + property.getPersistentClass().getIdentifierProperty()==property) { pattern.append("id"); } else{ pattern.append(tool.getTag(property)); @@ -199,7 +262,7 @@ return pattern.toString(); } - private ITextEditor getTextEditor(IEditorPart editorPart) { + private static ITextEditor getTextEditor(IEditorPart editorPart) { /* * if EditorPart is MultiPageEditorPart then get ITextEditor from it. */ @@ -216,4 +279,5 @@ } return null; } + } Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/actions/OpenSourceAction.java =================================================================== --- trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/actions/OpenSourceAction.java 2007-12-12 13:14:07 UTC (rev 5257) +++ trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/actions/OpenSourceAction.java 2007-12-12 14:32:04 UTC (rev 5258) @@ -2,7 +2,6 @@ import org.eclipse.core.resources.IFile; import org.eclipse.core.resources.IResource; -import org.eclipse.core.runtime.Assert; import org.eclipse.jdt.core.IJavaElement; import org.eclipse.jdt.core.IJavaProject; import org.eclipse.jdt.core.IType; @@ -18,6 +17,7 @@ import org.hibernate.console.ConsoleConfiguration; import org.hibernate.eclipse.console.HibernateConsolePlugin; import org.hibernate.eclipse.console.utils.ProjectUtils; +import org.hibernate.mapping.Component; import org.hibernate.mapping.PersistentClass; import org.hibernate.mapping.Property; import org.hibernate.mapping.RootClass; @@ -39,53 +39,72 @@ IStructuredSelection sel = getStructuredSelection(); if (sel instanceof TreeSelection){ TreePath path = ((TreeSelection)sel).getPaths()[0]; - PersistentClass persClass = getPersistentClass(path.getLastSegment()); - Assert.isNotNull(persClass); + Object lastSegment = path.getLastSegment(); + PersistentClass persClass = getPersistentClass(lastSegment); ConsoleConfiguration consoleConfiguration = (ConsoleConfiguration)(path.getSegment(0)); IJavaProject proj = ProjectUtils.findJavaProject(consoleConfiguration); - - IResource resource = null; + String fullyQualifiedName = OpenFileActionUtils.getPersistentClassName(persClass); - IType type = null; - try { - type = proj.findType(fullyQualifiedName); - if (type != null) resource = type.getResource(); - - } catch (JavaModelException e) { - HibernateConsolePlugin.getDefault().logErrorMessage("Can't find source file.", e); + if (fullyQualifiedName.length() == 0 + && lastSegment instanceof Property){ + Object prevSegment = path.getParentPath().getLastSegment(); + if (prevSegment instanceof Property + && ((Property)prevSegment).isComposite()){ + fullyQualifiedName =((Component)((Property) prevSegment).getValue()).getComponentClassName(); + } } - - if (resource instanceof IFile){ - try { - IEditorPart editorPart = OpenFileActionUtils.openEditor(HibernateConsolePlugin.getDefault().getActiveWorkbenchWindow().getActivePage(), (IFile) resource); - if (editorPart instanceof JavaEditor) { - IJavaElement jElement = null; - if (path.getLastSegment() instanceof Property){ - jElement = type.getField(((Property)path.getLastSegment()).getName()); - } else { - jElement = type; - } - JavaEditor jEditor = (JavaEditor) editorPart; - selectionToEditor(jElement, jEditor); - } - } catch (PartInitException e) { - HibernateConsolePlugin.getDefault().logErrorMessage("Can't open source file.", e); - } - } - - if (resource == null) { - MessageDialog.openInformation(HibernateConsolePlugin.getDefault().getShell(), "Open Source File", "Source file for class '" + fullyQualifiedName + "' not found."); - } + + run(lastSegment, proj, fullyQualifiedName); } } + + /** + * @param selection + * @param proj + * @param fullyQualifiedName + */ + public void run(Object selection, IJavaProject proj, + String fullyQualifiedName) { + IResource resource = null; + IType type = null; + try { + type = proj.findType(fullyQualifiedName); + if (type != null) resource = type.getResource(); + + } catch (JavaModelException e) { + HibernateConsolePlugin.getDefault().logErrorMessage("Can't find source file.", e); + } + + if (resource instanceof IFile){ + try { + IEditorPart editorPart = OpenFileActionUtils.openEditor(HibernateConsolePlugin.getDefault().getActiveWorkbenchWindow().getActivePage(), (IFile) resource); + if (editorPart instanceof JavaEditor) { + IJavaElement jElement = null; + if (selection instanceof Property){ + jElement = type.getField(((Property)selection).getName()); + } else { + jElement = type; + } + JavaEditor jEditor = (JavaEditor) editorPart; + selectionToEditor(jElement, jEditor); + } + } catch (PartInitException e) { + HibernateConsolePlugin.getDefault().logErrorMessage("Can't open source file.", e); + } + } + + if (resource == null) { + MessageDialog.openInformation(HibernateConsolePlugin.getDefault().getShell(), "Open Source File", "Source file for class '" + fullyQualifiedName + "' not found."); + } + } private PersistentClass getPersistentClass(Object selection){ if (selection instanceof Property){ return ((Property)selection).getPersistentClass(); - } else if (selection instanceof Subclass){ + } else if (selection instanceof PersistentClass){ return (PersistentClass)selection; } else { - return (RootClass)selection; + return null; } } Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/views/ConfigurationsViewActionGroup.java =================================================================== --- trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/views/ConfigurationsViewActionGroup.java 2007-12-12 13:14:07 UTC (rev 5257) +++ trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/views/ConfigurationsViewActionGroup.java 2007-12-12 14:32:04 UTC (rev 5258) @@ -40,6 +40,7 @@ import org.hibernate.eclipse.console.actions.OpenMappingAction; import org.hibernate.eclipse.console.actions.OpenSourceAction; import org.hibernate.eclipse.console.actions.RefreshAction; +import org.hibernate.mapping.PersistentClass; import org.hibernate.mapping.Property; import org.hibernate.mapping.RootClass; import org.hibernate.mapping.Subclass; @@ -137,17 +138,11 @@ menu.add(schemaExportAction); } menu.add(new Separator() ); - if (first instanceof RootClass - //|| first instanceof Property - || first instanceof Subclass){ + if (first instanceof PersistentClass + || first instanceof Property){ menu.add(openSourceAction); menu.add(openMappingAction); } - if (first instanceof Property - && ((Property)first).getPersistentClass() != null){ - menu.add(openSourceAction); - menu.add(openMappingAction); - } } public void fillActionBars(IActionBars actionBars) { Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/views/KnownConfigurationsView.java =================================================================== --- trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/views/KnownConfigurationsView.java 2007-12-12 13:14:07 UTC (rev 5257) +++ trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/views/KnownConfigurationsView.java 2007-12-12 14:32:04 UTC (rev 5258) @@ -31,6 +31,7 @@ import org.eclipse.jface.viewers.IDoubleClickListener; import org.eclipse.jface.viewers.ISelection; import org.eclipse.jface.viewers.IStructuredSelection; +import org.eclipse.jface.viewers.TreePath; import org.eclipse.jface.viewers.TreeSelection; import org.eclipse.jface.viewers.TreeViewer; import org.eclipse.swt.SWT; @@ -157,13 +158,10 @@ consoleConfiguration.executeHQLQuery( hql ); } } - } else if (firstElement instanceof RootClass - || firstElement instanceof Subclass - || (firstElement instanceof Property - && ((Property)firstElement).getPersistentClass() != null)) { - ConsoleConfiguration consoleConfiguration = (ConsoleConfiguration)((TreeSelection)selection).getPaths()[0].getSegment(0); - //OpenMappingActionDelegate.openMapping((RootClass) firstElement, consoleConfiguration); - new OpenMappingAction().run(firstElement, consoleConfiguration); + } else if (selection instanceof TreeSelection){ + TreePath path = ((TreeSelection)selection).getPaths()[0]; + ConsoleConfiguration consoleConfiguration = (ConsoleConfiguration)(path.getSegment(0)); + OpenMappingAction.run(path, consoleConfiguration); } } };

18 years

1
0
0 / 0

JBoss Tools SVN: r5257 - trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.view/src/org/jboss/tools/hibernate/ui/view/views.

by jbosstools-commits＠lists.jboss.org

Author: achabatar Date: 2007-12-12 08:14:07 -0500 (Wed, 12 Dec 2007) New Revision: 5257 Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.view/src/org/jboss/tools/hibernate/ui/view/views/OrmLabelProvider.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.view/src/org/jboss/tools/hibernate/ui/view/views/OrmModelImageVisitor.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.view/src/org/jboss/tools/hibernate/ui/view/views/OrmModelNameVisitor.java Log: http://jira.jboss.com/jira/browse/JBIDE-1417 Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.view/src/org/jboss/tools/hibernate/ui/view/views/OrmLabelProvider.java =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.view/src/org/jboss/tools/hibernate/ui/view/views/OrmLabelProvider.java 2007-12-12 13:14:01 UTC (rev 5256) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.view/src/org/jboss/tools/hibernate/ui/view/views/OrmLabelProvider.java 2007-12-12 13:14:07 UTC (rev 5257) @@ -28,13 +28,16 @@ import org.hibernate.mapping.Column; import org.hibernate.mapping.Component; import org.hibernate.mapping.DependantValue; +import org.hibernate.mapping.JoinedSubclass; import org.hibernate.mapping.ManyToOne; import org.hibernate.mapping.OneToMany; import org.hibernate.mapping.Property; import org.hibernate.mapping.RootClass; import org.hibernate.mapping.SimpleValue; +import org.hibernate.mapping.SingleTableSubclass; import org.hibernate.mapping.Subclass; import org.hibernate.mapping.Table; +import org.hibernate.mapping.UnionSubclass; public class OrmLabelProvider extends LabelProvider implements IColorProvider, IFontProvider { @@ -53,6 +56,14 @@ if (element instanceof RootClass) { descriptor = (ImageDescriptor) ((RootClass) element).accept(ormModelImageVisitor); + } else if (element instanceof UnionSubclass) { + descriptor = (ImageDescriptor) ((UnionSubclass) element).accept(ormModelImageVisitor); + } else if (element instanceof SingleTableSubclass) { + descriptor = (ImageDescriptor) ((SingleTableSubclass) element).accept(ormModelImageVisitor); + } else if (element instanceof JoinedSubclass) { + descriptor = (ImageDescriptor) ((JoinedSubclass) element).accept(ormModelImageVisitor); + } else if (element instanceof Subclass) { + descriptor = (ImageDescriptor) ((Subclass) element).accept(ormModelImageVisitor); } else if (element instanceof Property) { descriptor = (ImageDescriptor)ormModelImageVisitor.visitPersistentField((Property) element); } else if (element instanceof Table) { Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.view/src/org/jboss/tools/hibernate/ui/view/views/OrmModelImageVisitor.java =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.view/src/org/jboss/tools/hibernate/ui/view/views/OrmModelImageVisitor.java 2007-12-12 13:14:01 UTC (rev 5256) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.view/src/org/jboss/tools/hibernate/ui/view/views/OrmModelImageVisitor.java 2007-12-12 13:14:07 UTC (rev 5257) @@ -12,7 +12,6 @@ import java.util.ResourceBundle; -import org.hibernate.MappingException; import org.hibernate.mapping.Any; import org.hibernate.mapping.Array; import org.hibernate.mapping.Bag; @@ -42,8 +41,7 @@ * @author Tau * */ -public class OrmModelImageVisitor implements - /* IOrmModelVisitor, IHibernateMappingVisitor, */PersistentClassVisitor { +public class OrmModelImageVisitor implements PersistentClassVisitor { private ResourceBundle BUNDLE = ViewPlugin.BUNDLE_IMAGE; @@ -202,19 +200,23 @@ } public Object accept(UnionSubclass arg0) { - return null; + return ViewPlugin.getImageDescriptor(BUNDLE + .getString("OrmModelImageVisitor.PersistentClass")); //$NON-NLS-1$ } public Object accept(SingleTableSubclass arg0) { - return null; + return ViewPlugin.getImageDescriptor(BUNDLE + .getString("OrmModelImageVisitor.PersistentClass")); //$NON-NLS-1$ } public Object accept(JoinedSubclass arg0) { - return null; + return ViewPlugin.getImageDescriptor(BUNDLE + .getString("OrmModelImageVisitor.PersistentClass")); //$NON-NLS-1$ } public Object accept(Subclass arg0) { - return null; + return ViewPlugin.getImageDescriptor(BUNDLE + .getString("OrmModelImageVisitor.PersistentClass")); //$NON-NLS-1$ } } Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.view/src/org/jboss/tools/hibernate/ui/view/views/OrmModelNameVisitor.java =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.view/src/org/jboss/tools/hibernate/ui/view/views/OrmModelNameVisitor.java 2007-12-12 13:14:01 UTC (rev 5256) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.view/src/org/jboss/tools/hibernate/ui/view/views/OrmModelNameVisitor.java 2007-12-12 13:14:07 UTC (rev 5257) @@ -49,6 +49,28 @@ public Object visitDatabaseColumn(Column column, Object argument) { + String type = getColumnSqlType(column, argument); + + StringBuffer name = new StringBuffer(); + name.append(column.getName()); + + if (type != null) { + name.append(" ["); + name.append(type != null ? type.toUpperCase() : ""); + name.append(column.isNullable() ? " Nullable" : ""); + name.append(HibernateUtils.getTable(column) != null + && HibernateUtils.isPrimaryKey(column) ? " PK" : ""); + name.append(HibernateUtils.getTable(column) != null + && HibernateUtils.isForeignKey(column) ? " FK" : ""); + name.append("]"); + } + + return name.toString(); + + } + + public String getColumnSqlType(Column column, Object argument) { + Configuration cfg = null; Mapping mapping = null; Dialect dialect = null; @@ -83,24 +105,7 @@ } } - String type = column.getSqlType(dialect, mapping); - - StringBuffer name = new StringBuffer(); - name.append(column.getName()); - - if (type != null) { - name.append(" ["); - name.append(type != null ? type.toUpperCase() : ""); - name.append(column.isNullable() ? " Nullable" : ""); - name.append(HibernateUtils.getTable(column) != null - && HibernateUtils.isPrimaryKey(column) ? " PK" : ""); - name.append(HibernateUtils.getTable(column) != null - && HibernateUtils.isForeignKey(column) ? " FK" : ""); - name.append("]"); - } - - return name.toString(); - + return column.getSqlType(dialect, mapping); } public Object visitPersistentClass(RootClass clazz, Object argument) { @@ -167,8 +172,6 @@ name.append(typeString); } -// return name.toString(); - Value value = field.getValue(); String typeName = (String) value.accept(new TypeNameValueVisitor(false));

18 years

1
0
0 / 0

JBoss Tools SVN: r5256 - in trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/ui/veditor/editors: icons and 2 other directories.

by jbosstools-commits＠lists.jboss.org

Author: achabatar Date: 2007-12-12 08:14:01 -0500 (Wed, 12 Dec 2007) New Revision: 5256 Added: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/ui/veditor/editors/icons/ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/ui/veditor/editors/icons/outline.gif trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/ui/veditor/editors/icons/overview.gif trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/ui/veditor/editors/parts/DiagramTreeEditPart.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/ui/veditor/editors/parts/ExpandeableShapeTreeEditPart.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/ui/veditor/editors/parts/ShapeTreeEditPart.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/ui/veditor/editors/parts/TreePartFactory.java Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/ui/veditor/editors/DiagramContentOutlinePage.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/ui/veditor/editors/VisualEditor.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/ui/veditor/editors/model/ModelElement.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/ui/veditor/editors/model/Shape.java Log: http://jira.jboss.com/jira/browse/JBIDE-1417 Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/ui/veditor/editors/DiagramContentOutlinePage.java =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/ui/veditor/editors/DiagramContentOutlinePage.java 2007-12-12 13:03:43 UTC (rev 5255) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/ui/veditor/editors/DiagramContentOutlinePage.java 2007-12-12 13:14:01 UTC (rev 5256) @@ -21,26 +21,41 @@ import org.eclipse.gef.editparts.ScalableFreeformRootEditPart; import org.eclipse.gef.editparts.ZoomManager; import org.eclipse.gef.ui.parts.*; +import org.eclipse.jface.action.Action; +import org.eclipse.jface.action.IAction; +import org.eclipse.jface.action.IToolBarManager; +import org.eclipse.jface.resource.ImageDescriptor; import org.eclipse.jface.viewers.ISelectionChangedListener; import org.eclipse.swt.SWT; +import org.eclipse.swt.events.DisposeListener; import org.eclipse.swt.widgets.*; import org.eclipse.ui.part.IPageSite; import org.eclipse.ui.part.PageBook; +import org.jboss.tools.hibernate.ui.veditor.editors.model.OrmDiagram; +import org.jboss.tools.hibernate.ui.veditor.editors.parts.TreePartFactory; public class DiagramContentOutlinePage extends ContentOutlinePage implements IAdaptable { + private GraphicalViewer graphicalViewer; + + private VisualEditor editor; + + private OrmDiagram ormDiagram; private SelectionSynchronizer selectionSynchronizer; private PageBook pageBook; + private Control outline; /* * surface for drawing */ private Canvas overview; + private IAction showOutlineAction, showOverviewAction; + static final int ID_OUTLINE = 0; static final int ID_OVERVIEW = 1; @@ -118,7 +133,26 @@ * */ protected void configureOutlineViewer() { - showPage(ID_OUTLINE); + getViewer().setEditDomain(editor.getDefaultEditDomain()); + getViewer().setEditPartFactory(new TreePartFactory()); + IToolBarManager tbm = getSite().getActionBars().getToolBarManager(); + showOutlineAction = new Action() { + public void run() { + showPage(ID_OUTLINE); + } + }; + showOutlineAction.setImageDescriptor(ImageDescriptor.createFromFile( + VisualEditor.class,"icons/outline.gif")); //$NON-NLS-1$ + tbm.add(showOutlineAction); + showOverviewAction = new Action() { + public void run() { + showPage(ID_OVERVIEW); + } + }; + showOverviewAction.setImageDescriptor(ImageDescriptor.createFromFile( + VisualEditor.class,"icons/overview.gif")); //$NON-NLS-1$ + tbm.add(showOverviewAction); + showPage(ID_OVERVIEW); } @@ -127,9 +161,9 @@ */ public void createControl(Composite parent) { pageBook = new PageBook(parent, SWT.NONE); - + outline = getViewer().createControl(pageBook); overview = new Canvas(pageBook, SWT.NONE); - pageBook.showPage(overview); + pageBook.showPage(outline); configureOutlineViewer(); hookOutlineViewer(); initializeOutlineViewer(); @@ -141,8 +175,10 @@ */ public void dispose() { unhookOutlineViewer(); - if (thumbnail != null) + if (thumbnail != null) { thumbnail.deactivate(); + thumbnail = null; + } super.dispose(); } @@ -177,9 +213,12 @@ * */ protected void initializeOutlineViewer() { + setContents(getOrmDiagram()); } + private DisposeListener disposeListener; + /** * */ @@ -199,15 +238,29 @@ } } + public void setContents(Object contents) { + getViewer().setContents(contents); + } + /** * @param id */ protected void showPage(int id) { - if (thumbnail == null) - initializeOverview(); - pageBook.showPage(overview); - thumbnail.setVisible(true); + if (id == ID_OUTLINE) { + showOutlineAction.setChecked(true); + showOverviewAction.setChecked(false); + pageBook.showPage(outline); + if (thumbnail != null) + thumbnail.setVisible(false); + } else if (id == ID_OVERVIEW) { + if (thumbnail == null) + initializeOverview(); + showOutlineAction.setChecked(false); + showOverviewAction.setChecked(true); + pageBook.showPage(overview); + thumbnail.setVisible(true); + } } @@ -238,4 +291,26 @@ } } + /** + * @return the ormDiagram + */ + public OrmDiagram getOrmDiagram() { + return ormDiagram; + } + + /** + * @param ormDiagram the ormDiagram to set + */ + public void setOrmDiagram(OrmDiagram ormDiagram) { + this.ormDiagram = ormDiagram; + } + + public VisualEditor getEditor() { + return editor; + } + + public void setEditor(VisualEditor editor) { + this.editor = editor; + } + } Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/ui/veditor/editors/VisualEditor.java =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/ui/veditor/editors/VisualEditor.java 2007-12-12 13:03:43 UTC (rev 5255) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/ui/veditor/editors/VisualEditor.java 2007-12-12 13:14:01 UTC (rev 5256) @@ -138,6 +138,8 @@ new TreeViewer()); outline.setGraphicalViewer(getGraphicalViewer()); outline.setSelectionSynchronizer(getSelectionSynchronizer()); + outline.setOrmDiagram(ormDiagram); + outline.setEditor(this); return outline; } @@ -165,4 +167,9 @@ public OrmDiagram getViewerContents() { return ormDiagram; } + + public DefaultEditDomain getDefaultEditDomain() { + return getEditDomain(); + } + } Added: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/ui/veditor/editors/icons/outline.gif =================================================================== (Binary files differ) Property changes on: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/ui/veditor/editors/icons/outline.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/ui/veditor/editors/icons/overview.gif =================================================================== (Binary files differ) Property changes on: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/ui/veditor/editors/icons/overview.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/ui/veditor/editors/model/ModelElement.java =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/ui/veditor/editors/model/ModelElement.java 2007-12-12 13:03:43 UTC (rev 5255) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/ui/veditor/editors/model/ModelElement.java 2007-12-12 13:14:01 UTC (rev 5256) @@ -15,8 +15,14 @@ import java.util.ArrayList; import java.util.List; -public abstract class ModelElement{ +import org.eclipse.ui.views.properties.IPropertyDescriptor; +import org.eclipse.ui.views.properties.IPropertySource; +public abstract class ModelElement implements IPropertySource { + + /** An empty property descriptor. */ + private static final IPropertyDescriptor[] EMPTY_ARRAY = new IPropertyDescriptor[0]; + private transient PropertyChangeSupport pcsDelegate = new PropertyChangeSupport(this); public synchronized void addPropertyChangeListener(PropertyChangeListener l) { @@ -84,6 +90,45 @@ return null; } + public Object getEditableValue() { + return this; + } + + /** + * Children should override this. The default implementation returns an empty array. + */ + public IPropertyDescriptor[] getPropertyDescriptors() { + return EMPTY_ARRAY; + } + + /** + * Children should override this. The default implementation returns null. + */ + public Object getPropertyValue(Object id) { + return null; + } + + /** + * Children should override this. The default implementation returns false. + */ + public boolean isPropertySet(Object id) { + return false; + } + + /** + * Children should override this. The default implementation does nothing. + */ + public void resetPropertyValue(Object id) { + // do nothing + } + + /** + * Children should override this. The default implementation does nothing. + */ + public void setPropertyValue(Object id, Object value) { + // do nothing + } + class OList extends ArrayList{ public OList(){ Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/ui/veditor/editors/model/Shape.java =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/ui/veditor/editors/model/Shape.java 2007-12-12 13:03:43 UTC (rev 5255) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/ui/veditor/editors/model/Shape.java 2007-12-12 13:14:01 UTC (rev 5256) @@ -13,6 +13,13 @@ import java.util.ArrayList; import java.util.List; +import org.eclipse.ui.views.properties.IPropertyDescriptor; +import org.eclipse.ui.views.properties.TextPropertyDescriptor; +import org.hibernate.mapping.Column; +import org.hibernate.mapping.Property; +import org.jboss.tools.hibernate.ui.view.views.HibernateUtils; +import org.jboss.tools.hibernate.ui.view.views.OrmModelNameVisitor; + public class Shape extends ModelElement { private int indent = 0; @@ -25,7 +32,62 @@ public static final String SET_FOCUS = "set focus"; private Object ormElement; + + static OrmModelNameVisitor ormModelNameVisitor; + private static IPropertyDescriptor[] descriptors_property; + private static IPropertyDescriptor[] descriptors_column; + + /** + * Property set + */ + private static final String PROPERTY_NAME = "name"; + private static final String PROPERTY_TYPE = "type"; + private static final String PROPERTY_CLASS = "persistanceClass"; + private static final String PROPERTY_VALUE = "value"; + private static final String PROPERTY_SELECT = "selectable"; + private static final String PROPERTY_INSERT = "insertable"; + private static final String PROPERTY_UPDATE = "updateable"; + private static final String PROPERTY_CASCADE = "cascade"; + private static final String PROPERTY_LAZY = "lazy"; + private static final String PROPERTY_OPTIONAL = "optional"; + private static final String PROPERTY_NATURAL_IDENTIFIER = "naturalIdentifier"; + private static final String PROPERTY_NODE_NAME = "nodeName"; + private static final String PROPERTY_OPTIMISTIC_LOCKED = "optimisticLocked"; + private static final String PROPERTY_NULLABLE = "nullable"; + private static final String PROPERTY_UNIQUE = "unique"; + + static { + + ormModelNameVisitor = new OrmModelNameVisitor(); + + descriptors_property = new IPropertyDescriptor[] { + new TextPropertyDescriptor(PROPERTY_NAME, PROPERTY_NAME), + new TextPropertyDescriptor(PROPERTY_TYPE, PROPERTY_TYPE), + new TextPropertyDescriptor(PROPERTY_VALUE, PROPERTY_VALUE), + new TextPropertyDescriptor(PROPERTY_CLASS, PROPERTY_CLASS), + new TextPropertyDescriptor(PROPERTY_SELECT, PROPERTY_SELECT), + new TextPropertyDescriptor(PROPERTY_INSERT, PROPERTY_INSERT), + new TextPropertyDescriptor(PROPERTY_UPDATE, PROPERTY_UPDATE), + new TextPropertyDescriptor(PROPERTY_CASCADE, PROPERTY_CASCADE), + new TextPropertyDescriptor(PROPERTY_LAZY, PROPERTY_LAZY), + new TextPropertyDescriptor(PROPERTY_OPTIONAL, PROPERTY_OPTIONAL), + new TextPropertyDescriptor(PROPERTY_NATURAL_IDENTIFIER, PROPERTY_NATURAL_IDENTIFIER), + new TextPropertyDescriptor(PROPERTY_NODE_NAME, PROPERTY_NODE_NAME), + new TextPropertyDescriptor(PROPERTY_OPTIMISTIC_LOCKED, PROPERTY_OPTIMISTIC_LOCKED), + }; + + + descriptors_column = new IPropertyDescriptor[] { + new TextPropertyDescriptor(PROPERTY_NAME, PROPERTY_NAME), + new TextPropertyDescriptor(PROPERTY_TYPE, PROPERTY_TYPE), + new TextPropertyDescriptor(PROPERTY_VALUE, PROPERTY_VALUE), + new TextPropertyDescriptor(PROPERTY_NULLABLE, PROPERTY_NULLABLE), + new TextPropertyDescriptor(PROPERTY_UNIQUE, PROPERTY_UNIQUE), + }; + + } // static + protected Shape(Object ioe) { ormElement = ioe; } @@ -80,4 +142,131 @@ for (int i = 0; i < targetConnections.size(); i++) ((Connection)targetConnections.get(i)).setHidden(hiden); } + + /** + * Returns an array of IPropertyDescriptors for this shape. + * <p>The returned array is used to fill the property view, when the edit-part corresponding + * to this model element is selected.</p> + * @see #descriptors + * @see #getPropertyValue(Object) + * @see #setPropertyValue(Object, Object) + */ + public IPropertyDescriptor[] getPropertyDescriptors() { + if (getOrmElement() instanceof Property) { + return descriptors_property; + } + else if (getOrmElement() instanceof Column) { + return descriptors_column; + } + return super.getPropertyDescriptors(); + } + + /** + * Return the property value for the given propertyId, or null. + * <p>The property view uses the IDs from the IPropertyDescriptors array + * to obtain the value of the corresponding properties.</p> + * @see #descriptors + * @see #getPropertyDescriptors() + */ + public Object getPropertyValue(Object propertyId) { + if (PROPERTY_NAME.equals(propertyId)) { + if (getOrmElement() instanceof Property) { + return ((Property) getOrmElement()).getName(); + } + else if (getOrmElement() instanceof Column) { + return ((Column) getOrmElement()).getName(); + } + } + else if (PROPERTY_TYPE.equals(propertyId)) { + if (getOrmElement() instanceof Property) { + return ((Property) getOrmElement()).getType().getReturnedClass().getName(); + } + else if (getOrmElement() instanceof Column) { + String type = ormModelNameVisitor.getColumnSqlType((Column) getOrmElement(), getOrmDiagram().getConfiguration()); + Column column = (Column) getOrmElement(); + + StringBuffer name = new StringBuffer(); + + if (type != null) { + name.append(type != null ? type.toUpperCase() : ""); + name.append(HibernateUtils.getTable(column) != null + && HibernateUtils.isPrimaryKey(column) ? " PK" : ""); + name.append(HibernateUtils.getTable(column) != null + && HibernateUtils.isForeignKey(column) ? " FK" : ""); + } + + return name.toString(); + } + } + else if (PROPERTY_VALUE.equals(propertyId)) { + if (getOrmElement() instanceof Property) { + return ((Property) getOrmElement()).getValue().toString(); + } + else if (getOrmElement() instanceof Column) { + return ((Column) getOrmElement()).getValue().toString(); + } + } + else if (PROPERTY_CLASS.equals(propertyId)) { + if (getOrmElement() instanceof Property) { + return ((Property) getOrmElement()).getPersistentClass().getClassName(); + } + } + else if (PROPERTY_SELECT.equals(propertyId)) { + if (getOrmElement() instanceof Property) { + return Boolean.valueOf(((Property) getOrmElement()).isSelectable()).toString(); + } + } + else if (PROPERTY_INSERT.equals(propertyId)) { + if (getOrmElement() instanceof Property) { + return Boolean.valueOf(((Property) getOrmElement()).isInsertable()).toString(); + } + } + else if (PROPERTY_UPDATE.equals(propertyId)) { + if (getOrmElement() instanceof Property) { + return Boolean.valueOf(((Property) getOrmElement()).isUpdateable()).toString(); + } + } + else if (PROPERTY_CASCADE.equals(propertyId)) { + if (getOrmElement() instanceof Property) { + return ((Property) getOrmElement()).getCascade(); + } + } + else if (PROPERTY_LAZY.equals(propertyId)) { + if (getOrmElement() instanceof Property) { + return Boolean.valueOf(((Property) getOrmElement()).isLazy()).toString(); + } + } + else if (PROPERTY_OPTIONAL.equals(propertyId)) { + if (getOrmElement() instanceof Property) { + return Boolean.valueOf(((Property) getOrmElement()).isOptional()).toString(); + } + } + else if (PROPERTY_NATURAL_IDENTIFIER.equals(propertyId)) { + if (getOrmElement() instanceof Property) { + return Boolean.valueOf(((Property) getOrmElement()).isNaturalIdentifier()).toString(); + } + } + else if (PROPERTY_NODE_NAME.equals(propertyId)) { + if (getOrmElement() instanceof Property) { + return ((Property) getOrmElement()).getNodeName(); + } + } + else if (PROPERTY_OPTIMISTIC_LOCKED.equals(propertyId)) { + if (getOrmElement() instanceof Property) { + return Boolean.valueOf(((Property) getOrmElement()).isOptimisticLocked()).toString(); + } + } + else if (PROPERTY_NULLABLE.equals(propertyId)) { + if (getOrmElement() instanceof Column) { + return Boolean.valueOf(((Column) getOrmElement()).isNullable()).toString(); + } + } + else if (PROPERTY_UNIQUE.equals(propertyId)) { + if (getOrmElement() instanceof Column) { + return Boolean.valueOf(((Column) getOrmElement()).isUnique()).toString(); + } + } + return super.getPropertyValue(propertyId); + } + } Added: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/ui/veditor/editors/parts/DiagramTreeEditPart.java =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/ui/veditor/editors/parts/DiagramTreeEditPart.java (rev 0) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/ui/veditor/editors/parts/DiagramTreeEditPart.java 2007-12-12 13:14:01 UTC (rev 5256) @@ -0,0 +1,54 @@ +package org.jboss.tools.hibernate.ui.veditor.editors.parts; + +import java.beans.PropertyChangeEvent; +import java.beans.PropertyChangeListener; +import java.util.List; + +import org.eclipse.swt.widgets.Tree; +import org.jboss.tools.hibernate.ui.veditor.editors.model.OrmDiagram; + +public class DiagramTreeEditPart extends org.eclipse.gef.editparts.AbstractTreeEditPart + implements PropertyChangeListener +{ + + /** + * Constructor initializes this with the given model. + * + * @param model Model for this. + */ + public DiagramTreeEditPart(Object model) { + super (model); + } + + /** + * Returns the model of this as a OrmDiagram. + * + * @return Model of this. + */ + protected OrmDiagram getOrmDiagram() { + return (OrmDiagram)getModel(); + } + + /** + * Returns <code>null</code> as a Tree EditPart holds + * no children under it. + * + * @return <code>null</code> + */ + protected List getModelChildren() { + return getOrmDiagram().getChildren(); + } + + public void propertyChange(PropertyChangeEvent change){ + refreshVisuals(); + } + + /** + * Refreshes the visual properties of the TreeItem for this part. + */ + protected void refreshVisuals(){ + if (getWidget() instanceof Tree) + return; + } + +} Added: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/ui/veditor/editors/parts/ExpandeableShapeTreeEditPart.java =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/ui/veditor/editors/parts/ExpandeableShapeTreeEditPart.java (rev 0) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/ui/veditor/editors/parts/ExpandeableShapeTreeEditPart.java 2007-12-12 13:14:01 UTC (rev 5256) @@ -0,0 +1,72 @@ +package org.jboss.tools.hibernate.ui.veditor.editors.parts; + +import java.beans.PropertyChangeEvent; +import java.beans.PropertyChangeListener; +import java.util.List; + +import org.eclipse.swt.widgets.Tree; +import org.hibernate.cfg.Configuration; +import org.jboss.tools.hibernate.ui.veditor.editors.model.ExpandeableShape; +import org.jboss.tools.hibernate.ui.veditor.editors.model.Shape; +import org.jboss.tools.hibernate.ui.view.views.OrmLabelProvider; +import org.jboss.tools.hibernate.ui.view.views.OrmModelImageVisitor; +import org.jboss.tools.hibernate.ui.view.views.OrmModelNameVisitor; + +public class ExpandeableShapeTreeEditPart extends + org.eclipse.gef.editparts.AbstractTreeEditPart implements + PropertyChangeListener { + + static protected OrmLabelProvider ormLabelProvider = new OrmLabelProvider( + new OrmModelImageVisitor(), new OrmModelNameVisitor()); + + /** + * Constructor initializes this with the given model. + * + * @param model + * Model for this. + */ + public ExpandeableShapeTreeEditPart(Object model) { + super(model); + } + + /** + * Returns the model of this as a ExpandeableShape. + * + * @return Model of this. + */ + protected ExpandeableShape getExpandeableShape() { + return (ExpandeableShape) getModel(); + } + + /** + * Returns <code>null</code> as a Tree EditPart holds no children under + * it. + * + * @return <code>null</code> + */ + protected List getModelChildren() { + return getExpandeableShape().getChildren(); + } + + public void propertyChange(PropertyChangeEvent change) { + refreshVisuals(); + } + + /** + * Refreshes the visual properties of the TreeItem for this part. + */ + protected void refreshVisuals() { + if (getWidget() instanceof Tree) + return; + + Shape model = (Shape) getModel(); + + Object element = model.getOrmElement(); + Configuration cfg = model.getOrmDiagram().getConsoleConfiguration() + .getConfiguration(); + + setWidgetImage(ormLabelProvider.getImage(element)); + setWidgetText(ormLabelProvider.getText(element, cfg)); + } + +} Added: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/ui/veditor/editors/parts/ShapeTreeEditPart.java =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/ui/veditor/editors/parts/ShapeTreeEditPart.java (rev 0) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/ui/veditor/editors/parts/ShapeTreeEditPart.java 2007-12-12 13:14:01 UTC (rev 5256) @@ -0,0 +1,72 @@ +package org.jboss.tools.hibernate.ui.veditor.editors.parts; + +import java.beans.PropertyChangeEvent; +import java.beans.PropertyChangeListener; +import java.util.Collections; +import java.util.List; + +import org.eclipse.swt.widgets.Tree; +import org.hibernate.cfg.Configuration; +import org.jboss.tools.hibernate.ui.veditor.editors.model.ExpandeableShape; +import org.jboss.tools.hibernate.ui.veditor.editors.model.Shape; +import org.jboss.tools.hibernate.ui.view.views.OrmLabelProvider; +import org.jboss.tools.hibernate.ui.view.views.OrmModelImageVisitor; +import org.jboss.tools.hibernate.ui.view.views.OrmModelNameVisitor; + +public class ShapeTreeEditPart extends + org.eclipse.gef.editparts.AbstractTreeEditPart implements + PropertyChangeListener { + + static protected OrmLabelProvider ormLabelProvider = new OrmLabelProvider( + new OrmModelImageVisitor(), new OrmModelNameVisitor()); + + /** + * Constructor initializes this with the given model. + * + * @param model + * Model for this. + */ + public ShapeTreeEditPart(Object model) { + super(model); + } + + /** + * Returns the model of this as a ExpandeableShape. + * + * @return Model of this. + */ + protected ExpandeableShape getExpandeableShape() { + return (ExpandeableShape) getModel(); + } + + /** + * Returns <code>null</code> as a Tree EditPart holds no children under + * it. + * + * @return <code>null</code> + */ + protected List getModelChildren() { + return Collections.EMPTY_LIST; + } + + public void propertyChange(PropertyChangeEvent arg0) { + } + + /** + * Refreshes the visual properties of the TreeItem for this part. + */ + protected void refreshVisuals() { + if (getWidget() instanceof Tree) + return; + + Shape model = (Shape) getModel(); + + Object element = model.getOrmElement(); + Configuration cfg = model.getOrmDiagram().getConsoleConfiguration() + .getConfiguration(); + + setWidgetImage(ormLabelProvider.getImage(element)); + setWidgetText(ormLabelProvider.getText(element, cfg)); + } + +} Added: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/ui/veditor/editors/parts/TreePartFactory.java =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/ui/veditor/editors/parts/TreePartFactory.java (rev 0) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/ui/veditor/editors/parts/TreePartFactory.java 2007-12-12 13:14:01 UTC (rev 5256) @@ -0,0 +1,26 @@ +package org.jboss.tools.hibernate.ui.veditor.editors.parts; + +import org.eclipse.gef.EditPart; +import org.eclipse.gef.EditPartFactory; +import org.jboss.tools.hibernate.ui.veditor.editors.model.ExpandeableShape; +import org.jboss.tools.hibernate.ui.veditor.editors.model.OrmDiagram; +import org.jboss.tools.hibernate.ui.veditor.editors.model.Shape; + +public class TreePartFactory implements EditPartFactory { + + public EditPart createEditPart(EditPart context, Object modelElement) { + if (modelElement instanceof OrmDiagram) { + return new DiagramTreeEditPart(modelElement); + } + if (modelElement instanceof ExpandeableShape) { + return new ExpandeableShapeTreeEditPart(modelElement); + } + if (modelElement instanceof Shape) { + return new ShapeTreeEditPart(modelElement); + } + throw new RuntimeException("Can't create part for model element: " + + ((modelElement != null) ? modelElement.getClass().getName() + : "null")); + } + +}

18 years

1
0
0 / 0

JBoss Tools SVN: r5255 - in trunk/as/docs: reference/en/images/perspective and 7 other directories.

by jbosstools-commits＠lists.jboss.org

Author: afedosik Date: 2007-12-12 08:03:43 -0500 (Wed, 12 Dec 2007) New Revision: 5255 Added: trunk/as/docs/resources/support/lib/avalon-framework-4.2.0.jar trunk/as/docs/resources/support/lib/batik-all-1.6.jar trunk/as/docs/resources/support/lib/commons-io-1.3.1.jar trunk/as/docs/resources/support/lib/commons-logging-1.0.4.jar trunk/as/docs/resources/support/lib/fop-hyph.jar trunk/as/docs/resources/support/lib/fop-sandbox.jar trunk/as/docs/resources/support/lib/fop-transcoder-allinone.jar trunk/as/docs/resources/support/lib/fop-transcoder.jar trunk/as/docs/resources/support/lib/serializer-2.7.0.jar trunk/as/docs/resources/support/lib/servlet-2.2.jar trunk/as/docs/resources/support/lib/xalan-2.7.0.jar trunk/as/docs/resources/support/lib/xercesImpl-2.7.1.jar trunk/as/docs/resources/support/lib/xml-apis-1.3.02.jar trunk/as/docs/resources/support/lib/xmlgraphics-commons-1.2.jar Removed: trunk/as/docs/resources/support/lib/avalon-framework-cvs-20020806.jar trunk/as/docs/resources/support/lib/batik.jar Modified: trunk/as/docs/reference/en/images/modules/modules_1.png trunk/as/docs/reference/en/images/modules/modules_2.png trunk/as/docs/reference/en/images/perspective/perspective_10.png trunk/as/docs/reference/en/images/perspective/perspective_11.png trunk/as/docs/reference/en/images/perspective/perspective_13.png trunk/as/docs/reference/en/images/perspective/perspective_15.png trunk/as/docs/reference/en/images/perspective/perspective_2.png trunk/as/docs/reference/en/images/runtimes_servers/runtimes_servers_1.png trunk/as/docs/reference/en/images/runtimes_servers/runtimes_servers_2.png trunk/as/docs/reference/en/images/runtimes_servers/runtimes_servers_3.png trunk/as/docs/reference/en/images/runtimes_servers/runtimes_servers_4.png trunk/as/docs/reference/en/images/runtimes_servers/runtimes_servers_5.png trunk/as/docs/reference/en/images/webtools/webtools_1.png trunk/as/docs/reference/en/images/webtools/webtools_2.png trunk/as/docs/reference/en/images/webtools/webtools_3.png trunk/as/docs/reference/en/modules/perspective.xml trunk/as/docs/resources/styles/en/fopdf.xsl trunk/as/docs/resources/support.xml trunk/as/docs/resources/support/docbook-xsl/html/param.xsl trunk/as/docs/resources/support/lib/fop.jar Log: http://jira.jboss.com/jira/browse/JBDS-5 FOP updated to fop-0.94 version, screenshots for pdf version are fixed. "scale" attribute added for wide images. Modified: trunk/as/docs/reference/en/images/modules/modules_1.png =================================================================== (Binary files differ) Modified: trunk/as/docs/reference/en/images/modules/modules_2.png =================================================================== (Binary files differ) Modified: trunk/as/docs/reference/en/images/perspective/perspective_10.png =================================================================== (Binary files differ) Modified: trunk/as/docs/reference/en/images/perspective/perspective_11.png =================================================================== (Binary files differ) Modified: trunk/as/docs/reference/en/images/perspective/perspective_13.png =================================================================== (Binary files differ) Modified: trunk/as/docs/reference/en/images/perspective/perspective_15.png =================================================================== (Binary files differ) Modified: trunk/as/docs/reference/en/images/perspective/perspective_2.png =================================================================== (Binary files differ) Modified: trunk/as/docs/reference/en/images/runtimes_servers/runtimes_servers_1.png =================================================================== (Binary files differ) Modified: trunk/as/docs/reference/en/images/runtimes_servers/runtimes_servers_2.png =================================================================== (Binary files differ) Modified: trunk/as/docs/reference/en/images/runtimes_servers/runtimes_servers_3.png =================================================================== (Binary files differ) Modified: trunk/as/docs/reference/en/images/runtimes_servers/runtimes_servers_4.png =================================================================== (Binary files differ) Modified: trunk/as/docs/reference/en/images/runtimes_servers/runtimes_servers_5.png =================================================================== (Binary files differ) Modified: trunk/as/docs/reference/en/images/webtools/webtools_1.png =================================================================== (Binary files differ) Modified: trunk/as/docs/reference/en/images/webtools/webtools_2.png =================================================================== (Binary files differ) Modified: trunk/as/docs/reference/en/images/webtools/webtools_3.png =================================================================== (Binary files differ) Modified: trunk/as/docs/reference/en/modules/perspective.xml =================================================================== --- trunk/as/docs/reference/en/modules/perspective.xml 2007-12-12 12:03:36 UTC (rev 5254) +++ trunk/as/docs/reference/en/modules/perspective.xml 2007-12-12 13:03:43 UTC (rev 5255) @@ -40,7 +40,7 @@ <title>View Preferences</title> <mediaobject> <imageobject> - <imagedata fileref="images/perspective/perspective_2.png"/> + <imagedata fileref="images/perspective/perspective_2.png" scale="75"/> </imageobject> </mediaobject> </figure> @@ -147,7 +147,7 @@ <title>JMX Console</title> <mediaobject> <imageobject> - <imagedata fileref="images/perspective/perspective_17.png"/> + <imagedata fileref="images/perspective/perspective_17.png" scale="75"/> </imageobject> </mediaobject> </figure> Modified: trunk/as/docs/resources/styles/en/fopdf.xsl =================================================================== --- trunk/as/docs/resources/styles/en/fopdf.xsl 2007-12-12 12:03:36 UTC (rev 5254) +++ trunk/as/docs/resources/styles/en/fopdf.xsl 2007-12-12 13:03:43 UTC (rev 5255) @@ -112,7 +112,7 @@ <xsl:variable name="Version"> <xsl:choose> <xsl:when test="//releaseinfo"> - <xsl:text>JBoss </xsl:text> + <xsl:text></xsl:text> <xsl:value-of select="//releaseinfo"/> </xsl:when> <xsl:otherwise> @@ -215,7 +215,7 @@ <xsl:param name="tablecolumns.extension">0</xsl:param>  - <xsl:param name="fop.extensions">1</xsl:param> + <xsl:param name="fop1.extensions">1</xsl:param> @@ -225,8 +225,8 @@  <xsl:param name="generate.toc"> book toc,title</xsl:param>  -  - <xsl:param name="toc.section.depth">3</xsl:param> +  + <xsl:param name="toc.section.depth">5</xsl:param>  <xsl:param name="autotoc.label.separator" select="'. '"/> Modified: trunk/as/docs/resources/support/docbook-xsl/html/param.xsl =================================================================== --- trunk/as/docs/resources/support/docbook-xsl/html/param.xsl 2007-12-12 12:03:36 UTC (rev 5254) +++ trunk/as/docs/resources/support/docbook-xsl/html/param.xsl 2007-12-12 13:03:43 UTC (rev 5255) @@ -262,7 +262,7 @@ <xsl:param name="index.term.separator"/> <xsl:param name="index.range.separator"/> <xsl:param name="index.prefer.titleabbrev" select="0"/> -<xsl:param name="ignore.image.scaling" select="0"/> +<xsl:param name="ignore.image.scaling" select="1"/> <xsl:param name="inherit.keywords" select="1"/> <xsl:param name="insert.xref.page.number">no</xsl:param> <xsl:param name="javahelp.encoding">iso-8859-1</xsl:param> Added: trunk/as/docs/resources/support/lib/avalon-framework-4.2.0.jar =================================================================== (Binary files differ) Property changes on: trunk/as/docs/resources/support/lib/avalon-framework-4.2.0.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Deleted: trunk/as/docs/resources/support/lib/avalon-framework-cvs-20020806.jar =================================================================== (Binary files differ) Added: trunk/as/docs/resources/support/lib/batik-all-1.6.jar =================================================================== (Binary files differ) Property changes on: trunk/as/docs/resources/support/lib/batik-all-1.6.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Deleted: trunk/as/docs/resources/support/lib/batik.jar =================================================================== (Binary files differ) Added: trunk/as/docs/resources/support/lib/commons-io-1.3.1.jar =================================================================== (Binary files differ) Property changes on: trunk/as/docs/resources/support/lib/commons-io-1.3.1.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/as/docs/resources/support/lib/commons-logging-1.0.4.jar =================================================================== (Binary files differ) Property changes on: trunk/as/docs/resources/support/lib/commons-logging-1.0.4.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/as/docs/resources/support/lib/fop-hyph.jar =================================================================== (Binary files differ) Property changes on: trunk/as/docs/resources/support/lib/fop-hyph.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/as/docs/resources/support/lib/fop-sandbox.jar =================================================================== (Binary files differ) Property changes on: trunk/as/docs/resources/support/lib/fop-sandbox.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/as/docs/resources/support/lib/fop-transcoder-allinone.jar =================================================================== (Binary files differ) Property changes on: trunk/as/docs/resources/support/lib/fop-transcoder-allinone.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/as/docs/resources/support/lib/fop-transcoder.jar =================================================================== (Binary files differ) Property changes on: trunk/as/docs/resources/support/lib/fop-transcoder.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Modified: trunk/as/docs/resources/support/lib/fop.jar =================================================================== (Binary files differ) Added: trunk/as/docs/resources/support/lib/serializer-2.7.0.jar =================================================================== (Binary files differ) Property changes on: trunk/as/docs/resources/support/lib/serializer-2.7.0.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/as/docs/resources/support/lib/servlet-2.2.jar =================================================================== (Binary files differ) Property changes on: trunk/as/docs/resources/support/lib/servlet-2.2.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/as/docs/resources/support/lib/xalan-2.7.0.jar =================================================================== (Binary files differ) Property changes on: trunk/as/docs/resources/support/lib/xalan-2.7.0.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/as/docs/resources/support/lib/xercesImpl-2.7.1.jar =================================================================== (Binary files differ) Property changes on: trunk/as/docs/resources/support/lib/xercesImpl-2.7.1.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/as/docs/resources/support/lib/xml-apis-1.3.02.jar =================================================================== (Binary files differ) Property changes on: trunk/as/docs/resources/support/lib/xml-apis-1.3.02.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/as/docs/resources/support/lib/xmlgraphics-commons-1.2.jar =================================================================== (Binary files differ) Property changes on: trunk/as/docs/resources/support/lib/xmlgraphics-commons-1.2.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Modified: trunk/as/docs/resources/support.xml =================================================================== --- trunk/as/docs/resources/support.xml 2007-12-12 12:03:36 UTC (rev 5254) +++ trunk/as/docs/resources/support.xml 2007-12-12 13:03:43 UTC (rev 5255) @@ -37,6 +37,15 @@ </fileset> </path> + <property name="fop.home" value="${support.dir}/lib"/> + + <taskdef name="fop" + classname="org.apache.fop.tools.anttasks.Fop"> + <classpath refid="lib.classpath"> + + </classpath> + </taskdef> +  <target name="all.doc" depends="clean"> @@ -141,14 +150,24 @@ </xslt> -->  - <java classname="org.apache.fop.apps.Fop" + + <fop format="application/pdf" + basedir="${build.dir}/${lang}/pdf" + outfile="${build.dir}/${lang}/pdf/${pdf.name}" + fofile="${build.dir}/${lang}/pdf/docbook_fop.tmp" + messagelevel="debug"> + + </fop> + +  <delete file="${build.dir}/${lang}/pdf/docbook_fop.tmp"/> <delete dir="${build.dir}/${lang}/pdf/images"/>

18 years

1
0
0 / 0

JBoss Tools SVN: r5254 - in trunk/documentation/guides: resources/styles/en and 9 other directories.

by jbosstools-commits＠lists.jboss.org

Author: afedosik Date: 2007-12-12 07:03:36 -0500 (Wed, 12 Dec 2007) New Revision: 5254 Added: trunk/documentation/guides/resources/support/lib/avalon-framework-4.2.0.jar trunk/documentation/guides/resources/support/lib/batik-all-1.6.jar trunk/documentation/guides/resources/support/lib/commons-io-1.3.1.jar trunk/documentation/guides/resources/support/lib/commons-logging-1.0.4.jar trunk/documentation/guides/resources/support/lib/fop-hyph.jar trunk/documentation/guides/resources/support/lib/fop-sandbox.jar trunk/documentation/guides/resources/support/lib/fop-transcoder-allinone.jar trunk/documentation/guides/resources/support/lib/fop-transcoder.jar trunk/documentation/guides/resources/support/lib/serializer-2.7.0.jar trunk/documentation/guides/resources/support/lib/servlet-2.2.jar trunk/documentation/guides/resources/support/lib/xalan-2.7.0.jar trunk/documentation/guides/resources/support/lib/xercesImpl-2.7.1.jar trunk/documentation/guides/resources/support/lib/xml-apis-1.3.02.jar trunk/documentation/guides/resources/support/lib/xmlgraphics-commons-1.2.jar Removed: trunk/documentation/guides/resources/support/lib/avalon-framework-cvs-20020806.jar trunk/documentation/guides/resources/support/lib/batik.jar Modified: trunk/documentation/guides/resources/styles/en/fopdf.xsl trunk/documentation/guides/resources/support.xml trunk/documentation/guides/resources/support/docbook-xsl/html/param.xsl trunk/documentation/guides/resources/support/lib/fop.jar trunk/documentation/guides/userguide/Exadel-migration/en/images/jsf_struts/migration1.png trunk/documentation/guides/userguide/Exadel-migration/en/images/jsf_struts/migration2.png trunk/documentation/guides/userguide/Exadel-migration/en/images/jsf_struts/migration2_2.png trunk/documentation/guides/userguide/Exadel-migration/en/images/jsf_struts/migration2_21.png trunk/documentation/guides/userguide/Exadel-migration/en/images/jsf_struts/migration2_3.png trunk/documentation/guides/userguide/Exadel-migration/en/images/jsf_struts/migration2_4.png trunk/documentation/guides/userguide/Exadel-migration/en/images/jsf_struts/migration2_5.png trunk/documentation/guides/userguide/Exadel-migration/en/images/jsf_struts/migration3.png trunk/documentation/guides/userguide/Exadel-migration/en/images/jsf_struts/migration4.png trunk/documentation/guides/userguide/Exadel-migration/en/images/jsf_struts/migration5.png trunk/documentation/guides/userguide/Exadel-migration/en/images/jsf_struts_war/migration1.png trunk/documentation/guides/userguide/Exadel-migration/en/images/jsf_struts_war/migration_war1.png trunk/documentation/guides/userguide/Exadel-migration/en/images/jsf_struts_war/migration_war2.png trunk/documentation/guides/userguide/Exadel-migration/en/images/jsf_struts_war/migration_war2_1.png trunk/documentation/guides/userguide/Exadel-migration/en/images/jsf_struts_war/migration_war2_2.png trunk/documentation/guides/userguide/GettingStartedGuide/en/images/manage/manage_1.png trunk/documentation/guides/userguide/GettingStartedGuide/en/images/manage/manage_15.png trunk/documentation/guides/userguide/GettingStartedGuide/en/images/manage/manage_17.png trunk/documentation/guides/userguide/GettingStartedGuide/en/images/manage/manage_2.png trunk/documentation/guides/userguide/GettingStartedGuide/en/images/manage/manage_4.png trunk/documentation/guides/userguide/GettingStartedGuide/en/images/manage/manage_5.png trunk/documentation/guides/userguide/GettingStartedGuide/en/images/manage/manage_6.png trunk/documentation/guides/userguide/GettingStartedGuide/en/images/manage/manage_8.png trunk/documentation/guides/userguide/GettingStartedGuide/en/images/manage/manage_9.png trunk/documentation/guides/userguide/GettingStartedGuide/en/modules/first_seam.xml trunk/documentation/guides/userguide/GettingStartedGuide/en/modules/getting_started.xml trunk/documentation/guides/userguide/GettingStartedGuide/en/modules/jsp_application.xml trunk/documentation/guides/userguide/GettingStartedGuide/en/modules/rad_jsf_application.xml trunk/documentation/guides/userguide/Legacy-jsf-struts/en/images/jsf_application/jsf_application_1.png trunk/documentation/guides/userguide/Legacy-jsf-struts/en/images/jsf_application/jsf_application_10.png trunk/documentation/guides/userguide/Legacy-jsf-struts/en/images/jsf_application/jsf_application_2.png trunk/documentation/guides/userguide/Legacy-jsf-struts/en/images/jsf_application/jsf_application_4.png trunk/documentation/guides/userguide/Legacy-jsf-struts/en/images/jsf_application/jsf_application_5.png trunk/documentation/guides/userguide/Legacy-jsf-struts/en/images/jsf_application/jsf_application_6.png trunk/documentation/guides/userguide/Legacy-jsf-struts/en/images/jsf_application/jsf_application_7.png trunk/documentation/guides/userguide/Legacy-jsf-struts/en/images/jsf_application/jsf_application_8.png trunk/documentation/guides/userguide/Legacy-jsf-struts/en/images/jsf_application/jsf_application_9.png trunk/documentation/guides/userguide/Legacy-jsf-struts/en/images/struts_validation/struts_validation.png trunk/documentation/guides/userguide/Legacy-jsf-struts/en/images/struts_validation/struts_validation_1.png trunk/documentation/guides/userguide/Legacy-jsf-struts/en/images/struts_validation/struts_validation_2.png trunk/documentation/guides/userguide/Legacy-jsf-struts/en/modules/jsf_application.xml Log: http://jira.jboss.com/jira/browse/JBDS-5 FOP updated to fop-0.94 version, screenshots for pdf version are fixed. "scale" attribute added for wide images. Modified: trunk/documentation/guides/resources/styles/en/fopdf.xsl =================================================================== --- trunk/documentation/guides/resources/styles/en/fopdf.xsl 2007-12-12 10:56:25 UTC (rev 5253) +++ trunk/documentation/guides/resources/styles/en/fopdf.xsl 2007-12-12 12:03:36 UTC (rev 5254) @@ -112,7 +112,7 @@ <xsl:variable name="Version"> <xsl:choose> <xsl:when test="//releaseinfo"> - <xsl:text>JBoss </xsl:text> + <xsl:text></xsl:text> <xsl:value-of select="//releaseinfo"/> </xsl:when> <xsl:otherwise> @@ -215,7 +215,7 @@ <xsl:param name="tablecolumns.extension">0</xsl:param>  - <xsl:param name="fop.extensions">1</xsl:param> + <xsl:param name="fop1.extensions">1</xsl:param> Modified: trunk/documentation/guides/resources/support/docbook-xsl/html/param.xsl =================================================================== --- trunk/documentation/guides/resources/support/docbook-xsl/html/param.xsl 2007-12-12 10:56:25 UTC (rev 5253) +++ trunk/documentation/guides/resources/support/docbook-xsl/html/param.xsl 2007-12-12 12:03:36 UTC (rev 5254) @@ -262,7 +262,7 @@ <xsl:param name="index.term.separator"/> <xsl:param name="index.range.separator"/> <xsl:param name="index.prefer.titleabbrev" select="0"/> -<xsl:param name="ignore.image.scaling" select="0"/> +<xsl:param name="ignore.image.scaling" select="1"/> <xsl:param name="inherit.keywords" select="1"/> <xsl:param name="insert.xref.page.number">no</xsl:param> <xsl:param name="javahelp.encoding">iso-8859-1</xsl:param> Added: trunk/documentation/guides/resources/support/lib/avalon-framework-4.2.0.jar =================================================================== (Binary files differ) Property changes on: trunk/documentation/guides/resources/support/lib/avalon-framework-4.2.0.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Deleted: trunk/documentation/guides/resources/support/lib/avalon-framework-cvs-20020806.jar =================================================================== (Binary files differ) Added: trunk/documentation/guides/resources/support/lib/batik-all-1.6.jar =================================================================== (Binary files differ) Property changes on: trunk/documentation/guides/resources/support/lib/batik-all-1.6.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Deleted: trunk/documentation/guides/resources/support/lib/batik.jar =================================================================== (Binary files differ) Added: trunk/documentation/guides/resources/support/lib/commons-io-1.3.1.jar =================================================================== (Binary files differ) Property changes on: trunk/documentation/guides/resources/support/lib/commons-io-1.3.1.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/documentation/guides/resources/support/lib/commons-logging-1.0.4.jar =================================================================== (Binary files differ) Property changes on: trunk/documentation/guides/resources/support/lib/commons-logging-1.0.4.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/documentation/guides/resources/support/lib/fop-hyph.jar =================================================================== (Binary files differ) Property changes on: trunk/documentation/guides/resources/support/lib/fop-hyph.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/documentation/guides/resources/support/lib/fop-sandbox.jar =================================================================== (Binary files differ) Property changes on: trunk/documentation/guides/resources/support/lib/fop-sandbox.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/documentation/guides/resources/support/lib/fop-transcoder-allinone.jar =================================================================== (Binary files differ) Property changes on: trunk/documentation/guides/resources/support/lib/fop-transcoder-allinone.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/documentation/guides/resources/support/lib/fop-transcoder.jar =================================================================== (Binary files differ) Property changes on: trunk/documentation/guides/resources/support/lib/fop-transcoder.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Modified: trunk/documentation/guides/resources/support/lib/fop.jar =================================================================== (Binary files differ) Added: trunk/documentation/guides/resources/support/lib/serializer-2.7.0.jar =================================================================== (Binary files differ) Property changes on: trunk/documentation/guides/resources/support/lib/serializer-2.7.0.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/documentation/guides/resources/support/lib/servlet-2.2.jar =================================================================== (Binary files differ) Property changes on: trunk/documentation/guides/resources/support/lib/servlet-2.2.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/documentation/guides/resources/support/lib/xalan-2.7.0.jar =================================================================== (Binary files differ) Property changes on: trunk/documentation/guides/resources/support/lib/xalan-2.7.0.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/documentation/guides/resources/support/lib/xercesImpl-2.7.1.jar =================================================================== (Binary files differ) Property changes on: trunk/documentation/guides/resources/support/lib/xercesImpl-2.7.1.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/documentation/guides/resources/support/lib/xml-apis-1.3.02.jar =================================================================== (Binary files differ) Property changes on: trunk/documentation/guides/resources/support/lib/xml-apis-1.3.02.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/documentation/guides/resources/support/lib/xmlgraphics-commons-1.2.jar =================================================================== (Binary files differ) Property changes on: trunk/documentation/guides/resources/support/lib/xmlgraphics-commons-1.2.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Modified: trunk/documentation/guides/resources/support.xml =================================================================== --- trunk/documentation/guides/resources/support.xml 2007-12-12 10:56:25 UTC (rev 5253) +++ trunk/documentation/guides/resources/support.xml 2007-12-12 12:03:36 UTC (rev 5254) @@ -37,6 +37,15 @@ </fileset> </path> + <property name="fop.home" value="${support.dir}/lib"/> + + <taskdef name="fop" + classname="org.apache.fop.tools.anttasks.Fop"> + <classpath refid="lib.classpath"> + + </classpath> + </taskdef> +  <target name="all.doc" depends="clean"> @@ -141,15 +150,25 @@ </xslt> -->  - <java classname="org.apache.fop.apps.Fop" + + <fop format="application/pdf" + basedir="${build.dir}/${lang}/pdf" + outfile="${build.dir}/${lang}/pdf/${pdf.name}" + fofile="${build.dir}/${lang}/pdf/docbook_fop.tmp" + messagelevel="debug"> + + </fop> + + +--> +  <delete file="${build.dir}/${lang}/pdf/docbook_fop.tmp"/> <delete dir="${build.dir}/${lang}/pdf/images"/> </target> Modified: trunk/documentation/guides/userguide/Exadel-migration/en/images/jsf_struts/migration1.png =================================================================== (Binary files differ) Modified: trunk/documentation/guides/userguide/Exadel-migration/en/images/jsf_struts/migration2.png =================================================================== (Binary files differ) Modified: trunk/documentation/guides/userguide/Exadel-migration/en/images/jsf_struts/migration2_2.png =================================================================== (Binary files differ) Modified: trunk/documentation/guides/userguide/Exadel-migration/en/images/jsf_struts/migration2_21.png =================================================================== (Binary files differ) Modified: trunk/documentation/guides/userguide/Exadel-migration/en/images/jsf_struts/migration2_3.png =================================================================== (Binary files differ) Modified: trunk/documentation/guides/userguide/Exadel-migration/en/images/jsf_struts/migration2_4.png =================================================================== (Binary files differ) Modified: trunk/documentation/guides/userguide/Exadel-migration/en/images/jsf_struts/migration2_5.png =================================================================== (Binary files differ) Modified: trunk/documentation/guides/userguide/Exadel-migration/en/images/jsf_struts/migration3.png =================================================================== (Binary files differ) Modified: trunk/documentation/guides/userguide/Exadel-migration/en/images/jsf_struts/migration4.png =================================================================== (Binary files differ) Modified: trunk/documentation/guides/userguide/Exadel-migration/en/images/jsf_struts/migration5.png =================================================================== (Binary files differ) Modified: trunk/documentation/guides/userguide/Exadel-migration/en/images/jsf_struts_war/migration1.png =================================================================== (Binary files differ) Modified: trunk/documentation/guides/userguide/Exadel-migration/en/images/jsf_struts_war/migration_war1.png =================================================================== (Binary files differ) Modified: trunk/documentation/guides/userguide/Exadel-migration/en/images/jsf_struts_war/migration_war2.png =================================================================== (Binary files differ) Modified: trunk/documentation/guides/userguide/Exadel-migration/en/images/jsf_struts_war/migration_war2_1.png =================================================================== (Binary files differ) Modified: trunk/documentation/guides/userguide/Exadel-migration/en/images/jsf_struts_war/migration_war2_2.png =================================================================== (Binary files differ) Modified: trunk/documentation/guides/userguide/GettingStartedGuide/en/images/manage/manage_1.png =================================================================== (Binary files differ) Modified: trunk/documentation/guides/userguide/GettingStartedGuide/en/images/manage/manage_15.png =================================================================== (Binary files differ) Modified: trunk/documentation/guides/userguide/GettingStartedGuide/en/images/manage/manage_17.png =================================================================== (Binary files differ) Modified: trunk/documentation/guides/userguide/GettingStartedGuide/en/images/manage/manage_2.png =================================================================== (Binary files differ) Modified: trunk/documentation/guides/userguide/GettingStartedGuide/en/images/manage/manage_4.png =================================================================== (Binary files differ) Modified: trunk/documentation/guides/userguide/GettingStartedGuide/en/images/manage/manage_5.png =================================================================== (Binary files differ) Modified: trunk/documentation/guides/userguide/GettingStartedGuide/en/images/manage/manage_6.png =================================================================== (Binary files differ) Modified: trunk/documentation/guides/userguide/GettingStartedGuide/en/images/manage/manage_8.png =================================================================== (Binary files differ) Modified: trunk/documentation/guides/userguide/GettingStartedGuide/en/images/manage/manage_9.png =================================================================== (Binary files differ) Modified: trunk/documentation/guides/userguide/GettingStartedGuide/en/modules/first_seam.xml =================================================================== --- trunk/documentation/guides/userguide/GettingStartedGuide/en/modules/first_seam.xml 2007-12-12 10:56:25 UTC (rev 5253) +++ trunk/documentation/guides/userguide/GettingStartedGuide/en/modules/first_seam.xml 2007-12-12 12:03:36 UTC (rev 5254) @@ -135,7 +135,7 @@ <title>The Generated Application in Action</title> <mediaobject> <imageobject> - <imagedata fileref="images/first_seam/first_seam_10.png"/> + <imagedata fileref="images/first_seam/first_seam_10.png" scale="75"/> </imageobject> </mediaobject> </figure> @@ -146,7 +146,7 @@ <title>Making Changes in the Visual Editor</title> <mediaobject> <imageobject> - <imagedata fileref="images/first_seam/first_seam_11.png"/> + <imagedata fileref="images/first_seam/first_seam_11.png" scale="75"/> </imageobject> </mediaobject> </figure> Modified: trunk/documentation/guides/userguide/GettingStartedGuide/en/modules/getting_started.xml =================================================================== --- trunk/documentation/guides/userguide/GettingStartedGuide/en/modules/getting_started.xml 2007-12-12 10:56:25 UTC (rev 5253) +++ trunk/documentation/guides/userguide/GettingStartedGuide/en/modules/getting_started.xml 2007-12-12 12:03:36 UTC (rev 5254) @@ -270,7 +270,7 @@ <figure> <title>Web Resources</title> <imageobject> - <imagedata fileref="images/getting_started/getting_started_9.png"/> + <imagedata fileref="images/getting_started/getting_started_9.png" scale="75"/> </imageobject> </figure> Modified: trunk/documentation/guides/userguide/GettingStartedGuide/en/modules/jsp_application.xml =================================================================== --- trunk/documentation/guides/userguide/GettingStartedGuide/en/modules/jsp_application.xml 2007-12-12 10:56:25 UTC (rev 5253) +++ trunk/documentation/guides/userguide/GettingStartedGuide/en/modules/jsp_application.xml 2007-12-12 12:03:36 UTC (rev 5254) @@ -65,7 +65,7 @@ <title>Create JSP Page</title> <mediaobject> <imageobject> - <imagedata fileref="images/jsp_application/jsp_application_3.png"/> + <imagedata fileref="images/jsp_application/jsp_application_3.png" scale="75"/> </imageobject> </mediaobject> </figure> @@ -191,7 +191,7 @@ <title>Archive in Project Archives View</title> <mediaobject> <imageobject> - <imagedata fileref="images/jsp_application/jsp_application_12.png"/> + <imagedata fileref="images/jsp_application/jsp_application_12.png" scale="75"/> </imageobject> </mediaobject> </figure> @@ -202,7 +202,7 @@ <title>Configure Archive</title> <mediaobject> <imageobject> - <imagedata fileref="images/jsp_application/jsp_application_13.png"/> + <imagedata fileref="images/jsp_application/jsp_application_13.png" scale="75"/> </imageobject> </mediaobject> </figure> Modified: trunk/documentation/guides/userguide/GettingStartedGuide/en/modules/rad_jsf_application.xml =================================================================== --- trunk/documentation/guides/userguide/GettingStartedGuide/en/modules/rad_jsf_application.xml 2007-12-12 10:56:25 UTC (rev 5253) +++ trunk/documentation/guides/userguide/GettingStartedGuide/en/modules/rad_jsf_application.xml 2007-12-12 12:03:36 UTC (rev 5254) @@ -417,7 +417,7 @@ <title>Code Assist</title> <mediaobject> <imageobject> - <imagedata fileref="images/rad_jsf_application/rad_jsf_application_13.png"/> + <imagedata fileref="images/rad_jsf_application/rad_jsf_application_13.png" scale="75"/> </imageobject> </mediaobject> </figure> @@ -553,7 +553,7 @@ <title>Code Assist for <f:param></title> <mediaobject> <imageobject> - <imagedata fileref="images/rad_jsf_application/rad_jsf_application_18.png"/> + <imagedata fileref="images/rad_jsf_application/rad_jsf_application_18.png" scale="75"/> </imageobject> </mediaobject> </figure> @@ -605,7 +605,7 @@ <title>You are Asked to Enter a Number Between 0 and 100</title> <mediaobject> <imageobject> - <imagedata fileref="images/rad_jsf_application/rad_jsf_application_20.png"/> + <imagedata fileref="images/rad_jsf_application/rad_jsf_application_20.png" scale="75"/> </imageobject> </mediaobject> </figure> @@ -613,7 +613,7 @@ <title>Your Input is Validated and an Error Message is Displayed if Invalid Input was Entered</title> <mediaobject> <imageobject> - <imagedata fileref="images/rad_jsf_application/rad_jsf_application_21.png"/> + <imagedata fileref="images/rad_jsf_application/rad_jsf_application_21.png" scale="75"/> </imageobject> </mediaobject> </figure> @@ -622,7 +622,7 @@ <title>After You Enter a Guess, the Application Tells You Whether a Smaller or a Larger Number Should be Tried</title> <mediaobject> <imageobject> - <imagedata fileref="images/rad_jsf_application/rad_jsf_application_22.png"/> + <imagedata fileref="images/rad_jsf_application/rad_jsf_application_22.png" scale="75"/> </imageobject> </mediaobject> </figure> @@ -631,7 +631,7 @@ <title>Your Guess is Correct</title> <mediaobject> <imageobject> - <imagedata fileref="images/rad_jsf_application/rad_jsf_application_23.png"/> + <imagedata fileref="images/rad_jsf_application/rad_jsf_application_23.png" scale="75"/> </imageobject> </mediaobject> </figure> Modified: trunk/documentation/guides/userguide/Legacy-jsf-struts/en/images/jsf_application/jsf_application_1.png =================================================================== (Binary files differ) Modified: trunk/documentation/guides/userguide/Legacy-jsf-struts/en/images/jsf_application/jsf_application_10.png =================================================================== (Binary files differ) Modified: trunk/documentation/guides/userguide/Legacy-jsf-struts/en/images/jsf_application/jsf_application_2.png =================================================================== (Binary files differ) Modified: trunk/documentation/guides/userguide/Legacy-jsf-struts/en/images/jsf_application/jsf_application_4.png =================================================================== (Binary files differ) Modified: trunk/documentation/guides/userguide/Legacy-jsf-struts/en/images/jsf_application/jsf_application_5.png =================================================================== (Binary files differ) Modified: trunk/documentation/guides/userguide/Legacy-jsf-struts/en/images/jsf_application/jsf_application_6.png =================================================================== (Binary files differ) Modified: trunk/documentation/guides/userguide/Legacy-jsf-struts/en/images/jsf_application/jsf_application_7.png =================================================================== (Binary files differ) Modified: trunk/documentation/guides/userguide/Legacy-jsf-struts/en/images/jsf_application/jsf_application_8.png =================================================================== (Binary files differ) Modified: trunk/documentation/guides/userguide/Legacy-jsf-struts/en/images/jsf_application/jsf_application_9.png =================================================================== (Binary files differ) Modified: trunk/documentation/guides/userguide/Legacy-jsf-struts/en/images/struts_validation/struts_validation.png =================================================================== (Binary files differ) Modified: trunk/documentation/guides/userguide/Legacy-jsf-struts/en/images/struts_validation/struts_validation_1.png =================================================================== (Binary files differ) Modified: trunk/documentation/guides/userguide/Legacy-jsf-struts/en/images/struts_validation/struts_validation_2.png =================================================================== (Binary files differ) Modified: trunk/documentation/guides/userguide/Legacy-jsf-struts/en/modules/jsf_application.xml =================================================================== --- trunk/documentation/guides/userguide/Legacy-jsf-struts/en/modules/jsf_application.xml 2007-12-12 10:56:25 UTC (rev 5253) +++ trunk/documentation/guides/userguide/Legacy-jsf-struts/en/modules/jsf_application.xml 2007-12-12 12:03:36 UTC (rev 5254) @@ -151,7 +151,7 @@ <title>Tree View in Config Editor</title> <mediaobject> <imageobject> - <imagedata fileref="images/jsf_application/jsf_application_5.png"/> + <imagedata fileref="images/jsf_application/jsf_application_5.png" scale="75"/> </imageobject> </mediaobject> </figure>

18 years

1
0
0 / 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

jbosstools-commits December 2007