[jbpm-commits] JBoss JBPM SVN: r2306 - in jbpm3/trunk/modules/gwt-console: war and 2 other directories.

Author: heiko.braun(a)jboss.com Date: 2008-09-22 07:25:09 -0400 (Mon, 22 Sep 2008) New Revision: 2306 Modified: jbpm3/trunk/modules/gwt-console/pom.xml jbpm3/trunk/modules/gwt-console/war/pom.xml jbpm3/trunk/modules/gwt-console/war/src/main/java/org/jboss/bpm/console/client/process/ProcessImageView.java jbpm3/trunk/modules/gwt-console/war/src/main/java/org/jboss/bpm/console/client/process/ProcessInstanceEditor.java jbpm3/trunk/modules/gwt-console/war/src/main/resources/org/jboss/bpm/console/public/console.css Log: Update to gwt 1.5.2 and gwt-ext 2.0.5 Modified: jbpm3/trunk/modules/gwt-console/pom.xml =================================================================== --- jbpm3/trunk/modules/gwt-console/pom.xml 2008-09-21 08:51:33 UTC (rev 2305) +++ jbpm3/trunk/modules/gwt-console/pom.xml 2008-09-22 11:25:09 UTC (rev 2306) @@ -2,7 +2,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> <name>JBoss jBPM - GWT Console</name> - <groupId>org.jbpm</groupId> + <groupId>org.jbpm.jbpm3</groupId> <artifactId>gwt-console</artifactId> <packaging>pom</packaging> @@ -14,6 +14,11 @@ <relativePath>../../pom.xml</relativePath> </parent> + <properties> + <gchart.version>2.2</gchart.version> + <gwtext.version>2.0.5</gwtext.version> + </properties> + <modules> <module>war</module> </modules> @@ -23,8 +28,13 @@ <dependency> <groupId>com.gwtext</groupId> <artifactId>gwtext</artifactId> - <version>2.0.4</version> + <version>${gwtext.version}</version> </dependency> + <dependency> + <groupId>com.google.gwt</groupId> + <artifactId>gchart</artifactId> + <version>${gchart.version}</version> + </dependency> </dependencies> </dependencyManagement> </project> Modified: jbpm3/trunk/modules/gwt-console/war/pom.xml =================================================================== --- jbpm3/trunk/modules/gwt-console/war/pom.xml 2008-09-21 08:51:33 UTC (rev 2305) +++ jbpm3/trunk/modules/gwt-console/war/pom.xml 2008-09-22 11:25:09 UTC (rev 2306) @@ -1,14 +1,14 @@ <?xml version="1.0" encoding="UTF-8"?> <project> <modelVersion>4.0.0</modelVersion> - <name>JBossBPM - GWT Console (WAR)</name> - <groupId>org.jboss.bpm</groupId> + <name>JBoss jBPM - GWT Console (WAR)</name> + <groupId>org.jbpm.jbpm3</groupId> <artifactId>gwt-console-war</artifactId> <packaging>war</packaging> <!-- Parent --> <parent> - <groupId>org.jboss.bpm</groupId> + <groupId>org.jbpm.jbpm3</groupId> <artifactId>gwt-console</artifactId> <version>3.3.0-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> @@ -19,20 +19,37 @@ <dependency> <groupId>com.google.gwt</groupId> <artifactId>gwt-servlet</artifactId> + <version>${gwt.version}</version> <scope>runtime</scope> </dependency> <dependency> <groupId>com.google.gwt</groupId> <artifactId>gwt-user</artifactId> + <version>${gwt.version}</version> <scope>provided</scope> </dependency> <dependency> + <groupId>com.google.gwt</groupId> + <artifactId>gwt-dev</artifactId> + <version>${gwt.version}</version> + <classifier>${platform}-libs</classifier> + <type>zip</type> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>com.google.gwt</groupId> + <artifactId>gwt-dev</artifactId> + <version>${gwt.version}</version> + <classifier>${platform}</classifier> + <scope>provided</scope> + </dependency> + <dependency> <groupId>com.gwtext</groupId> - <artifactId>gwtext</artifactId> + <artifactId>gwtext</artifactId> </dependency> <dependency> <groupId>com.google.gwt</groupId> - <artifactId>gchart</artifactId> + <artifactId>gchart</artifactId> </dependency> </dependencies> @@ -42,45 +59,60 @@ <plugin> <groupId>com.totsp.gwt</groupId> <artifactId>maven-googlewebtoolkit2-plugin</artifactId> - <version>2.0-beta18</version> + <version>2.0-beta23</version> <configuration> <logLevel>INFO</logLevel> <compileTargets> <value>org.jboss.bpm.console.Application</value> </compileTargets> <runTarget>org.jboss.bpm.console.Application/Application.html</runTarget> - <generatorRootClasses> - <value>org.jboss.bpm.console.Application</value> - </generatorRootClasses> - <overwriteGeneratedClasses>true</overwriteGeneratedClasses> <style>DETAILED</style> - <generateGettersAndSetters>true</generateGettersAndSetters> <noServer>false</noServer> - <extraJvmArgs>-Dgwt.coverage.enable=true -Xmx256M -Xms256M</extraJvmArgs> + <extraJvmArgs>-Xmx512m</extraJvmArgs> + <!-- this parameter is VERY important with automatic mode - has to match the version in your declared deps --> + <!-- if this is set incorrect, or left out and default does not match (default is 1.5.2 for 2.0-beta23) you will have mysterious errors --> + <gwtVersion>${gwt.version}</gwtVersion> </configuration> <executions> <execution> - <id>compile</id> - <phase>process-classes</phase> <goals> + <goal>mergewebxml</goal> <goal>compile</goal> + <goal>gwt</goal> + <!--goal>test</goal--> </goals> </execution> + </executions> + </plugin> + <!-- Use the dependency plugin to unpack gwt-dev-PLATFORM-libs.zip --> + <!-- + (this is a replacement for the old "automatic" mode - useful if you + don't have GWT installed already, or you just want a maven way to + handle gwt deps) + --> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-dependency-plugin</artifactId> + <executions> <execution> + <id>unpack</id> + <phase>compile</phase> <goals> - <!-- - autoconfig gwt (download and unzip GWT itself) - *note* you can also use manual config, if you already have GWT installed - see site docs for details - - http://gwt-maven.googlecode.com/svn/docs/maven-googlewebtoolkit2-plugin/s... - --> - <goal>setup</goal> - <goal>extractGwt</goal> - <!-- actual work goals --> - <goal>mergewebxml</goal> - <goal>compile</goal> - <goal>gwt</goal> + <goal>unpack</goal> </goals> + <configuration> + <artifactItems> + <artifactItem> + <groupId>com.google.gwt</groupId> + <artifactId>gwt-dev</artifactId> + <version>${gwt.version}</version> + <classifier>${platform}-libs</classifier> + <type>zip</type> + <overWrite>false</overWrite> + <outputDirectory>${settings.localRepository}/com/google/gwt/gwt-dev/${gwt.version}</outputDirectory> + </artifactItem> + </artifactItems> + </configuration> </execution> </executions> </plugin> @@ -94,4 +126,44 @@ </plugins> </build> -</project> \ No newline at end of file + + <!-- profiles (with activation per platform) --> + <profiles> + <profile> + <id>gwt-dev-windows</id> + <properties> + <platform>windows</platform> + </properties> + <activation> + <activeByDefault>true</activeByDefault> + <os> + <family>windows</family> + </os> + </activation> + </profile> + <profile> + <id>gwt-dev-mac</id> + <properties> + <platform>mac</platform> + </properties> + <activation> + <activeByDefault>false</activeByDefault> + <os> + <family>mac</family> + </os> + </activation> + </profile> + <profile> + <id>gwt-dev-linux</id> + <properties> + <platform>linux</platform> + </properties> + <activation> + <activeByDefault>false</activeByDefault> + <os> + <name>linux</name> + </os> + </activation> + </profile> + </profiles> +</project> Modified: jbpm3/trunk/modules/gwt-console/war/src/main/java/org/jboss/bpm/console/client/process/ProcessImageView.java =================================================================== --- jbpm3/trunk/modules/gwt-console/war/src/main/java/org/jboss/bpm/console/client/process/ProcessImageView.java 2008-09-21 08:51:33 UTC (rev 2305) +++ jbpm3/trunk/modules/gwt-console/war/src/main/java/org/jboss/bpm/console/client/process/ProcessImageView.java 2008-09-22 11:25:09 UTC (rev 2306) @@ -42,7 +42,10 @@ image.setStyleName("bpm-ProcessImage"); this.setHeader(false); - this.setBorder(false); + this.setBorder(true); + this.setFrame(false); + + this.setAutoScroll(true); this.add(image); Modified: jbpm3/trunk/modules/gwt-console/war/src/main/java/org/jboss/bpm/console/client/process/ProcessInstanceEditor.java =================================================================== --- jbpm3/trunk/modules/gwt-console/war/src/main/java/org/jboss/bpm/console/client/process/ProcessInstanceEditor.java 2008-09-21 08:51:33 UTC (rev 2305) +++ jbpm3/trunk/modules/gwt-console/war/src/main/java/org/jboss/bpm/console/client/process/ProcessInstanceEditor.java 2008-09-22 11:25:09 UTC (rev 2306) @@ -37,21 +37,21 @@ /** * @author Heiko.Braun <heiko.braun(a)jboss.com&gt; * - * @see ProcessInstanceList#onExamine(Integer) + * @see ProcessInstanceList#onExamine(Integer) */ public class ProcessInstanceEditor extends EditorView { public final static String ID = "org.jboss.bpm.process.ProcessInstance"; private ProcessDefinition processDefinition; - + private ProcessInstance processInstance; private ConsoleView view; private Panel teaserPanel; - - public ProcessInstanceEditor(ProcessDefinition proc, ProcessInstance instance, ConsoleView view) + + public ProcessInstanceEditor(final ProcessDefinition proc, final ProcessInstance instance, final ConsoleView view) { super(); this.setId(ProcessInstanceEditor.ID+"."+instance.getId()); @@ -61,20 +61,50 @@ this.view = view; // ---------------------------------- - - this.setPaddings(15); + + this.setPaddings(10); this.setWidth(UIConstants.EDITOR_PANE_WIDTH); this.setLayout( new ColumnLayout() ); - + this.setBorder(false); this.setHeader(false); // ---------------------------------- - PaddedPanel rightPanel = new PaddedPanel(new ProcessImageView(instance), 5, 5, 0, 5); + ProcessImageView imageView = new ProcessImageView(instance); + imageView.setWidth(UIConstants.MAIN_EDITOR_PANEL_WIDTH); + Toolbar imageToolbar = new Toolbar(); + imageToolbar.addFill(); + ToolbarButton toolbarButton = new ToolbarButton("Enlarge", + new ButtonListenerAdapter() + { + public void onClick(Button button, EventObject e) + { + + final Window window = new Window(); + window.setTitle("Process Graph"); + window.setClosable(true); + window.setWidth(600); + window.setHeight(400); + window.setPlain(true); + /*window.setLayout(new BorderLayout()); + window.add(tabPanel, centerData); + window.add(navPanel, westData);*/ + window.setCloseAction(Window.HIDE); + window.add(new ProcessImageView(instance) ); + window.show(""); + } + } + ); + toolbarButton.setIconCls("bpm-enlarge-icon"); + imageToolbar.addButton( toolbarButton ); + imageView.setBottomToolbar(imageToolbar); + + PaddedPanel rightPanel = new PaddedPanel(imageView, 5, 5, 0, 5); + // ---------------------------------- - + teaserPanel = new TeaserPanel(); // ---------------------------------- @@ -86,14 +116,16 @@ Toolbar bottomToolbar = new Toolbar(); bottomToolbar.addFill(); - bottomToolbar.addButton( - new ToolbarButton("View tasks", new ButtonListenerAdapter() + ToolbarButton taskBtn = new ToolbarButton("View tasks", + new ButtonListenerAdapter() { public void onClick(Button button, EventObject e) { } - }) + } ); + taskBtn.setIconCls("bpm-switch-context-icon"); + bottomToolbar.addButton(taskBtn); taskPanel.setBottomToolbar(bottomToolbar); teaserPanel.add(taskPanel); @@ -118,9 +150,9 @@ commentPanel.setBottomToolbar(bottomToolbar2); teaserPanel.add(commentPanel); - + // ---------------------------------- - + this.add(rightPanel, new ColumnLayoutData(0.7) ); this.add(teaserPanel, new ColumnLayoutData(0.3) ); } Modified: jbpm3/trunk/modules/gwt-console/war/src/main/resources/org/jboss/bpm/console/public/console.css =================================================================== --- jbpm3/trunk/modules/gwt-console/war/src/main/resources/org/jboss/bpm/console/public/console.css 2008-09-21 08:51:33 UTC (rev 2305) +++ jbpm3/trunk/modules/gwt-console/war/src/main/resources/org/jboss/bpm/console/public/console.css 2008-09-22 11:25:09 UTC (rev 2306) @@ -92,3 +92,6 @@ background-image: url( images/icons/27.png) } +.bpm-enalrge-icon { + background-image: url( images/icons/49.png) +}