JBoss Tools SVN: r39120 - trunk/central/plugins/org.jboss.tools.central.discovery.
by jbosstools-commits＠lists.jboss.org
Author: fbricon
Date: 2012-02-24 10:58:43 -0500 (Fri, 24 Feb 2012)
New Revision: 39120
Modified:
trunk/central/plugins/org.jboss.tools.central.discovery/plugin.xml
Log:
JBIDE-10750 and JBIDE-10604 add JPA and Profiles Mgmt maven features
Modified: trunk/central/plugins/org.jboss.tools.central.discovery/plugin.xml
===================================================================
--- trunk/central/plugins/org.jboss.tools.central.discovery/plugin.xml 2012-02-24 15:32:06 UTC (rev 39119)
+++ trunk/central/plugins/org.jboss.tools.central.discovery/plugin.xml 2012-02-24 15:58:43 UTC (rev 39120)
@@ -133,6 +133,40 @@
url="http://www.jboss.org/tools">
</overview>
</connectorDescriptor>
+ <connectorDescriptor
+ categoryId="org.jboss.tools.central.discovery.maven"
+ groupId="org.jboss.tools.central.discovery.maven.configurators"
+ description="JBoss Maven JPA Configurator"
+ id="org.jboss.tools.maven.jpa.feature"
+ kind="task"
+ license="Free, EPL"
+ name="JBoss Maven JPA Configurator"
+ provider="JBoss by Red Hat"
+ siteUrl="http://download.jboss.org/jbosstools/updates/development/indigo">
+ <icon
+ image32="images/jbosstools_icon32.png">
+ </icon>
+ <overview
+ url="http://www.jboss.org/tools">
+ </overview>
+ </connectorDescriptor>
+ <connectorDescriptor
+ categoryId="org.jboss.tools.central.discovery.maven"
+ groupId="org.jboss.tools.central.discovery.maven.configurators"
+ description="Maven Profile Management UI"
+ id="org.jboss.tools.maven.profiles.feature"
+ kind="task"
+ license="Free, EPL"
+ name="Maven Profile Management UI"
+ provider="JBoss by Red Hat"
+ siteUrl="http://download.jboss.org/jbosstools/updates/development/indigo">
+ <icon
+ image32="images/jbosstools_icon32.png">
+ </icon>
+ <overview
+ url="http://www.jboss.org/tools">
+ </overview>
+ </connectorDescriptor>
<connectorDescriptor
categoryId="org.jboss.tools.central.discovery.maven"
12 years, 4 months
- 1
- 0
JBoss Tools SVN: r39119 - in trunk/esb/plugins/org.jboss.tools.esb.project.ui: src/org/jboss/tools/esb/project/ui/visualizer and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: bfitzpat
Date: 2012-02-24 10:32:06 -0500 (Fri, 24 Feb 2012)
New Revision: 39119
Modified:
trunk/esb/plugins/org.jboss.tools.esb.project.ui/META-INF/MANIFEST.MF
trunk/esb/plugins/org.jboss.tools.esb.project.ui/src/org/jboss/tools/esb/project/ui/visualizer/ESBVisualizerView.java
Log:
[JBIDE-11049] Removed XModel-specific dependency for opening a node in the ESB editor
Modified: trunk/esb/plugins/org.jboss.tools.esb.project.ui/META-INF/MANIFEST.MF
===================================================================
--- trunk/esb/plugins/org.jboss.tools.esb.project.ui/META-INF/MANIFEST.MF 2012-02-24 15:22:54 UTC (rev 39118)
+++ trunk/esb/plugins/org.jboss.tools.esb.project.ui/META-INF/MANIFEST.MF 2012-02-24 15:32:06 UTC (rev 39119)
@@ -38,8 +38,7 @@
org.jboss.ide.eclipse.as.core;bundle-version="1.0.0",
org.jboss.tools.common.ui;bundle-version="3.1.0",
org.eclipse.zest.core,
- org.eclipse.zest.layouts,
- org.jboss.tools.common.model
+ org.eclipse.zest.layouts
Bundle-ActivationPolicy: lazy
Bundle-Vendor: %Bundle-Vendor.0
Eclipse-RegisterBuddy: org.eclipse.jst.ws.annotations.core
Modified: trunk/esb/plugins/org.jboss.tools.esb.project.ui/src/org/jboss/tools/esb/project/ui/visualizer/ESBVisualizerView.java
===================================================================
--- trunk/esb/plugins/org.jboss.tools.esb.project.ui/src/org/jboss/tools/esb/project/ui/visualizer/ESBVisualizerView.java 2012-02-24 15:22:54 UTC (rev 39118)
+++ trunk/esb/plugins/org.jboss.tools.esb.project.ui/src/org/jboss/tools/esb/project/ui/visualizer/ESBVisualizerView.java 2012-02-24 15:32:06 UTC (rev 39119)
@@ -10,15 +10,20 @@
******************************************************************************/
package org.jboss.tools.esb.project.ui.visualizer;
+import java.util.HashMap;
import java.util.Iterator;
+import java.util.List;
import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.IMarker;
import org.eclipse.core.resources.ResourcesPlugin;
+import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IPath;
import org.eclipse.jface.action.Action;
import org.eclipse.jface.action.IAction;
import org.eclipse.jface.action.IMenuListener;
import org.eclipse.jface.action.IMenuManager;
+import org.eclipse.jface.action.IStatusLineManager;
import org.eclipse.jface.action.IToolBarManager;
import org.eclipse.jface.action.MenuManager;
import org.eclipse.jface.resource.ImageDescriptor;
@@ -29,15 +34,18 @@
import org.eclipse.jface.viewers.ISelection;
import org.eclipse.jface.viewers.IStructuredSelection;
import org.eclipse.swt.SWT;
+import org.eclipse.swt.events.SelectionAdapter;
+import org.eclipse.swt.events.SelectionEvent;
import org.eclipse.swt.graphics.Color;
import org.eclipse.swt.graphics.Image;
import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Display;
import org.eclipse.swt.widgets.Menu;
import org.eclipse.ui.IActionBars;
import org.eclipse.ui.ISelectionListener;
+import org.eclipse.ui.IViewSite;
import org.eclipse.ui.IWorkbenchPage;
import org.eclipse.ui.IWorkbenchPart;
-import org.eclipse.ui.PartInitException;
import org.eclipse.ui.dialogs.ISelectionValidator;
import org.eclipse.ui.ide.IDE;
import org.eclipse.ui.part.IShowInTarget;
@@ -59,9 +67,6 @@
import org.eclipse.zest.layouts.algorithms.TreeLayoutAlgorithm;
import org.eclipse.zest.layouts.constraints.BasicEntityConstraint;
import org.eclipse.zest.layouts.constraints.LayoutConstraint;
-import org.jboss.tools.common.model.XModelObject;
-import org.jboss.tools.common.model.util.EclipseResourceUtil;
-import org.jboss.tools.common.model.util.FindObjectHelper;
import org.jboss.tools.esb.project.ui.ESBProjectPlugin;
import org.jboss.tools.esb.project.ui.messages.JBossESBUIMessages;
import org.jboss.tools.esb.project.ui.visualizer.ESBNode.ESBType;
@@ -143,6 +148,33 @@
// empty
}
+ public void putMessageOnStatusLine ( final String message ) {
+ final Display display = Display.getDefault();
+ new Thread() {
+ public void run() {
+ display.syncExec(new Runnable() {
+ /*
+ * (non-Javadoc)
+ * @see java.lang.Runnable#run()
+ */
+ public void run() {
+ IViewSite vSite = ( IViewSite ) getSite();
+ IActionBars actionBars = vSite.getActionBars();
+ if( actionBars == null )
+ return ;
+
+ IStatusLineManager statusLineManager =
+ actionBars.getStatusLineManager();
+ if( statusLineManager == null )
+ return ;
+
+ statusLineManager.setMessage( message );
+ }
+ });
+ }
+ }.start();
+ }
+
/**
* This is a callback that will allow us
* to create the viewer and initialize it.
@@ -151,6 +183,30 @@
this.gv = new GraphViewer(parent, SWT.NONE);
gv.getGraphControl().addConstraintAdapter(new ESBViewerConstraintAdapter());
gv.addDoubleClickListener(new FixNodeDoubleClickListener());
+ gv.getGraphControl().addSelectionListener(new SelectionAdapter() {
+
+ public void widgetSelected(SelectionEvent e) {
+ List<?> listSelection = ((Graph) e.widget).getSelection();
+ if (!listSelection.isEmpty() && listSelection.get(0) instanceof GraphNode) {
+ GraphNode node = (GraphNode) listSelection.get(0);
+ if (node.getData() != null && node.getData() instanceof ESBNode) {
+ ESBNode esbnode = (ESBNode) node.getData();
+ String modelpath = "";
+ while (esbnode != null && esbnode.getParent() != null) {
+ if (modelpath.trim().length() > 0)
+ modelpath = "->" + modelpath; //$NON-NLS-1$
+ modelpath = esbnode.getName() + modelpath;
+ esbnode = esbnode.getParent();
+ }
+ final String message = currentFile.getName() + "->" + modelpath;//$NON-NLS-1$
+ putMessageOnStatusLine(message);
+ }
+ } else {
+ putMessageOnStatusLine(null);
+ }
+ }
+
+ });
makeActions();
hookContextMenu();
fillToolBar();
@@ -543,44 +599,24 @@
esbnode = esbnode.getParent();
}
-// boolean useIdeMethod = false;
-// if (useIdeMethod) {
-// modelpath = "FileSystems/project/" + currentFile.getProjectRelativePath().toString() + "/" + modelpath;
-// // modelpath = "FileSystems/project/esbcontent/META-INF/jboss-esb.xml/Services/SimpleListener";
-//
-// IWorkbenchPage page = getSite().getPage();
-// HashMap<String, String> map = new HashMap<String, String>();
-// map.put("xpath", modelpath);// "action/path/whatever");
-// map.put(IDE.EDITOR_ID_ATTR,
-// "org.jboss.tools.common.model.ui.editor.EditorPartWrapper");
-// try {
-// IMarker marker = currentFile.createMarker(IMarker.TEXT);
-// marker.setAttributes(map);
-// IDE.openEditor(page, marker); //3.0 API
-// marker.delete();
-// } catch (CoreException e) {
-// e.printStackTrace();
-// }
-// } else {
- // if we have an empty path, the user double-clicked on the root
- // so just open the file
- if (modelpath.trim().length() == 0) {
- IWorkbenchPage page = getSite().getPage();
- try {
- IDE.openEditor(page, currentFile);
- } catch (PartInitException e) {
- e.printStackTrace();
- }
- } else {
- // otherwise use the FindObjectHelper to find the actual node
- // in the ESB editor
- XModelObject fileObject =
- EclipseResourceUtil.createObjectForResource(currentFile);
- XModelObject actionObject =
- fileObject.getChildByPath(modelpath); //"Services/SimpleListener/Actions/displayAction");
- FindObjectHelper.findModelObject(actionObject, FindObjectHelper.IN_EDITOR_ONLY);
+ modelpath = "FileSystems/" + currentFile.getProject().getName() + //$NON-NLS-1$
+ "/" + currentFile.getProjectRelativePath().toString() + //$NON-NLS-1$
+ "/" + modelpath;//$NON-NLS-1$
+
+ IWorkbenchPage page = getSite().getPage();
+ HashMap<String, String> map = new HashMap<String, String>();
+ map.put("path", modelpath);// "action/path/whatever");
+ map.put("tab", "Tree");
+ map.put(IDE.EDITOR_ID_ATTR,
+ "org.jboss.tools.common.model.ui.editor.EditorPartWrapper");//$NON-NLS-1$
+ try {
+ IMarker marker = currentFile.createMarker(IMarker.TEXT);
+ marker.setAttributes(map);
+ IDE.openEditor(page, marker); //3.0 API
+ marker.delete();
+ } catch (CoreException e) {
+ e.printStackTrace();
}
- // }
}
}
}
12 years, 4 months
- 1
- 0
JBoss Tools SVN: r39118 - in trunk/vpe/plugins: org.jboss.tools.vpe.browsersim.browser/src/org/jboss/tools/vpe/browsersim/browser and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: yradtsevich
Date: 2012-02-24 10:22:54 -0500 (Fri, 24 Feb 2012)
New Revision: 39118
Modified:
trunk/vpe/plugins/org.jboss.tools.vpe.browsersim.browser/src/org/jboss/tools/vpe/browsersim/browser/PlatformUtil.java
trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/ui/BrowserSim.java
Log:
https://issues.jboss.org/browse/JBIDE-11048 : BrowserSim: wrong application name in the Mac OS X menu-bar: 'SWT' instead of 'BrowserSim'
Modified: trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/ui/BrowserSim.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/ui/BrowserSim.java 2012-02-24 15:12:29 UTC (rev 39117)
+++ trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/ui/BrowserSim.java 2012-02-24 15:22:54 UTC (rev 39118)
@@ -45,6 +45,7 @@
import org.eclipse.swt.widgets.Monitor;
import org.eclipse.swt.widgets.Shell;
import org.jboss.tools.vpe.browsersim.browser.BrowserSimBrowser;
+import org.jboss.tools.vpe.browsersim.browser.PlatformUtil;
import org.jboss.tools.vpe.browsersim.browser.WebKitBrowserFactory;
import org.jboss.tools.vpe.browsersim.model.Device;
import org.jboss.tools.vpe.browsersim.model.DeviceOrientation;
@@ -70,6 +71,10 @@
private Image[] icons;
public static void main(String[] args) {
+ if (PlatformUtil.OS_MACOSX.equals(PlatformUtil.getOs())) {
+ // set application name for Mac OS X menu-bar https://issues.jboss.org/browse/JBIDE-11048
+ System.setProperty("com.apple.mrj.application.apple.menu.about.name", Messages.BrowserSim_BROWSER_SIM);//$NON-NLS-1$
+ }
String homeUrl;
if (args.length > 0) {
String lastArg = args[args.length - 1];
Modified: trunk/vpe/plugins/org.jboss.tools.vpe.browsersim.browser/src/org/jboss/tools/vpe/browsersim/browser/PlatformUtil.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe.browsersim.browser/src/org/jboss/tools/vpe/browsersim/browser/PlatformUtil.java 2012-02-24 15:12:29 UTC (rev 39117)
+++ trunk/vpe/plugins/org.jboss.tools.vpe.browsersim.browser/src/org/jboss/tools/vpe/browsersim/browser/PlatformUtil.java 2012-02-24 15:22:54 UTC (rev 39118)
@@ -17,13 +17,14 @@
*/
public class PlatformUtil {
+ public static final String OS_MACOSX = "macosx";
public static final String CURRENT_PLATFORM;
static {
String os = getOs();
String ws = getWs();
String arch = getArch();
- if ("macosx".equals(os) && "x86".equals(arch)) {
+ if (OS_MACOSX.equals(os) && "x86".equals(arch)) {
CURRENT_PLATFORM = ws + '.' + os; // special case for MacOSX x86 (its SWT bundle has name org.eclipse.swt.cocoa.macosx)
} else {
CURRENT_PLATFORM = ws + '.' + os + '.' + arch;
@@ -45,13 +46,13 @@
/*
* Copy of org.eclipse.swt.internal.Library.os()
*/
- private static String getOs() {
+ public static String getOs() {
String osName = System.getProperty("os.name"); //$NON-NLS-1$
if (osName.equals ("Linux")) return "linux"; //$NON-NLS-1$ $NON-NLS-2$
if (osName.equals ("AIX")) return "aix"; //$NON-NLS-1$ $NON-NLS-2$
if (osName.equals ("Solaris") || osName.equals ("SunOS")) return "solaris"; //$NON-NLS-1$ $NON-NLS-2$ $NON-NLS-3$
if (osName.equals ("HP-UX")) return "hpux"; //$NON-NLS-1$ $NON-NLS-2$
- if (osName.equals ("Mac OS X")) return "macosx"; //$NON-NLS-1$ $NON-NLS-2$
+ if (osName.equals ("Mac OS X")) return OS_MACOSX; //$NON-NLS-1$ $NON-NLS-2$
if (osName.startsWith ("Win")) return "win32"; //$NON-NLS-1$ $NON-NLS-2$
return osName;
}
12 years, 4 months
- 1
- 0
JBoss Tools SVN: r39117 - in trunk/examples/plugins/org.jboss.tools.project.examples: src/org/jboss/tools/project/examples/configurators and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: fbricon
Date: 2012-02-24 10:12:29 -0500 (Fri, 24 Feb 2012)
New Revision: 39117
Added:
trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/configurators/discovery.properties
Removed:
trunk/examples/plugins/org.jboss.tools.project.examples/template/
Modified:
trunk/examples/plugins/org.jboss.tools.project.examples/pom.xml
trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/configurators/DefaultJBossCentralConfigurator.java
Log:
JBIDE-10401 : improve maven filtering for discovery url externalization
Modified: trunk/examples/plugins/org.jboss.tools.project.examples/pom.xml
===================================================================
--- trunk/examples/plugins/org.jboss.tools.project.examples/pom.xml 2012-02-24 15:08:03 UTC (rev 39116)
+++ trunk/examples/plugins/org.jboss.tools.project.examples/pom.xml 2012-02-24 15:12:29 UTC (rev 39117)
@@ -9,14 +9,15 @@
</parent>
<groupId>org.jboss.tools.examples.plugins</groupId>
<artifactId>org.jboss.tools.project.examples</artifactId>
-
- <properties>
+
+ <properties>
<!-- TODO: for GA, change this from /development/indigo/ to /stable/indigo/ -->
<jboss.discovery.directory.url>http://download.jboss.org/jbosstools/updates/development/indigo/jbosstool...</jboss.discovery.directory.url>
</properties>
<profiles>
- <!-- _stable_branch jobs could use this profile but the above default (last stable milestone) is probably better -->
+ <!-- _stable_branch jobs could use this profile but the above default (last
+ stable milestone) is probably better -->
<profile>
<id>3.3.indigo</id>
<activation>
@@ -40,59 +41,32 @@
</profiles>
<packaging>eclipse-plugin</packaging>
<build>
+ <resources>
+ <resource>
+ <directory>src</directory>
+ <includes>
+ <include>**/discovery.properties</include>
+ </includes>
+ <filtering>true</filtering>
+ </resource>
+ </resources>
<plugins>
- <!-- This will copy from the source folder to the template folder. Use only if no filtering/replacement has already been done in source folder
<plugin>
<artifactId>maven-resources-plugin</artifactId>
<version>2.5</version>
<executions>
<execution>
- <id>copy-resources</id>
- <phase>validate</phase>
+ <id>resource-filtering</id>
+ <!-- Need to execute resource filtering AFTER tycho-compiler-plugin
+ is executed -->
+ <phase>process-classes</phase>
<goals>
- <goal>copy-resources</goal>
+ <goal>resources</goal>
</goals>
- <configuration>
- <outputDirectory>${basedir}/template/</outputDirectory>
- <resources>
- <resource>
- <directory>src/org/jboss/tools/project/examples/configurators/</directory>
- <includes>
- <include>**/DefaultJBossCentralConfigurator.java</include>
- </includes>
- <filtering>true</filtering>
- </resource>
- </resources>
- </configuration>
</execution>
</executions>
- </plugin> -->
- <plugin>
- <artifactId>maven-resources-plugin</artifactId>
- <version>2.5</version>
- <executions>
- <execution>
- <id>copy-resources</id>
- <phase>validate</phase>
- <goals>
- <goal>copy-resources</goal>
- </goals>
- <configuration>
- <outputDirectory>${basedir}/src/org/jboss/tools/project/examples/configurators/</outputDirectory>
- <resources>
- <resource>
- <directory>template/</directory>
- <includes>
- <include>**/DefaultJBossCentralConfigurator.java</include>
- </includes>
- <filtering>true</filtering>
- </resource>
- </resources>
- </configuration>
- </execution>
- </executions>
</plugin>
</plugins>
</build>
-
+
</project>
\ No newline at end of file
Modified: trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/configurators/DefaultJBossCentralConfigurator.java
===================================================================
--- trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/configurators/DefaultJBossCentralConfigurator.java 2012-02-24 15:08:03 UTC (rev 39116)
+++ trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/configurators/DefaultJBossCentralConfigurator.java 2012-02-24 15:12:29 UTC (rev 39117)
@@ -13,6 +13,7 @@
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
+import java.util.ResourceBundle;
import org.eclipse.swt.graphics.Image;
import org.jboss.tools.project.examples.ProjectExamplesActivator;
@@ -44,7 +45,18 @@
private static final String JBOSS_DIRECTORY_URL_DEFAULT = "http://download.jboss.org/jbosstools/updates/development/indigo/jbosstool..."; //$NON-NLS-1$
// see pom.xml for actual value -- this is passed it at build-time via Maven
- private static final String JBOSS_DIRECTORY_URL = "http://download.jboss.org/jbosstools/updates/development/indigo/jbosstool..."; //$NON-NLS-1$
+ private static final String JBOSS_DIRECTORY_URL;
+
+ static {
+ ResourceBundle rb = ResourceBundle.getBundle("org.jboss.tools.project.examples.configurators.discovery"); //$NON-NLS-1$
+ String url = rb.getString("discovery.url").trim(); //$NON-NLS-1$
+ if ("".equals(url) || "${jboss.discovery.directory.url}".equals(url)){ //$NON-NLS-1$//$NON-NLS-2$
+ //was not filtered, fallback to default value
+ JBOSS_DIRECTORY_URL = JBOSS_DIRECTORY_URL_DEFAULT;
+ } else {
+ JBOSS_DIRECTORY_URL = url;
+ }
+ }
private static final String TWITTER_LINK ="http://twitter.com/#!/jbosstools"; //$NON-NLS-1$
@@ -66,8 +78,8 @@
// use commandline override -Djboss.discovery.directory.url
String directory = System.getProperty(ProjectExamplesActivator.JBOSS_DISCOVERY_DIRECTORY, null);
if (directory == null) {
- // else use Maven-generated value; fall back to default
- return JBOSS_DIRECTORY_URL.equals("${" + "jboss.discovery.directory.url" + "}") ? JBOSS_DIRECTORY_URL_DEFAULT : JBOSS_DIRECTORY_URL; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ // else use Maven-generated value (or fall back to default)
+ return JBOSS_DIRECTORY_URL;
}
return directory;
}
Added: trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/configurators/discovery.properties
===================================================================
--- trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/configurators/discovery.properties (rev 0)
+++ trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/configurators/discovery.properties 2012-02-24 15:12:29 UTC (rev 39117)
@@ -0,0 +1 @@
+discovery.url=${jboss.discovery.directory.url}
\ No newline at end of file
12 years, 4 months
- 1
- 0
JBoss Tools SVN: r39116 - branches/jbosstools-3.3.0.Beta1/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2012-02-24 10:08:03 -0500 (Fri, 24 Feb 2012)
New Revision: 39116
Modified:
branches/jbosstools-3.3.0.Beta1/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ApplicationConfigurationWizardPage.java
Log:
[JBIDE-11037] changed error to warning iforming the user that the app names could possibly conflict with an existing proj in his workspace
Modified: branches/jbosstools-3.3.0.Beta1/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ApplicationConfigurationWizardPage.java
===================================================================
--- branches/jbosstools-3.3.0.Beta1/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ApplicationConfigurationWizardPage.java 2012-02-24 15:07:46 UTC (rev 39115)
+++ branches/jbosstools-3.3.0.Beta1/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ApplicationConfigurationWizardPage.java 2012-02-24 15:08:03 UTC (rev 39116)
@@ -78,6 +78,7 @@
import org.eclipse.swt.widgets.Table;
import org.eclipse.swt.widgets.Text;
import org.jboss.tools.common.ui.WizardUtils;
+import org.jboss.tools.common.ui.databinding.ParametrizableWizardPageSupport;
import org.jboss.tools.common.ui.databinding.ValueBindingBuilder;
import org.jboss.tools.openshift.express.internal.ui.OpenShiftUIActivator;
import org.jboss.tools.openshift.express.internal.ui.utils.Logger;
@@ -97,7 +98,8 @@
* @author Andre Dietisheim
* @author Xavier Coulon
*/
-public class ApplicationConfigurationWizardPage extends AbstractOpenShiftWizardPage {
+public class ApplicationConfigurationWizardPage extends
+ AbstractOpenShiftWizardPage {
private CheckboxTableViewer viewer;
private ApplicationConfigurationWizardPageModel pageModel;
@@ -113,84 +115,108 @@
private Button checkAllButton;
private Button uncheckAllButton;
- public ApplicationConfigurationWizardPage(IWizard wizard, OpenShiftExpressApplicationWizardModel wizardModel) {
- super("Setup OpenShift Application", "Select an existing or create a new OpenShift Express Application.",
+ public ApplicationConfigurationWizardPage(IWizard wizard,
+ OpenShiftExpressApplicationWizardModel wizardModel) {
+ super(
+ "Setup OpenShift Application",
+ "Select an existing or create a new OpenShift Express Application.",
"Setup OpenShift Application", wizard);
try {
- this.pageModel = new ApplicationConfigurationWizardPageModel(wizardModel);
+ this.pageModel = new ApplicationConfigurationWizardPageModel(
+ wizardModel);
} catch (OpenShiftException e) {
- IStatus status = OpenShiftUIActivator.createErrorStatus(e.getMessage(), e);
+ IStatus status = OpenShiftUIActivator.createErrorStatus(
+ e.getMessage(), e);
OpenShiftUIActivator.log(status);
- ErrorDialog.openError(getShell(), "Error", "Error initializing application configuration page", status);
+ ErrorDialog
+ .openError(
+ getShell(),
+ "Error",
+ "Error initializing application configuration page",
+ status);
}
}
@Override
protected void doCreateControls(Composite container, DataBindingContext dbc) {
GridLayoutFactory.fillDefaults().applyTo(container);
- GridDataFactory.fillDefaults().grab(true, true).align(SWT.FILL, SWT.FILL).applyTo(container);
+ GridDataFactory.fillDefaults().grab(true, true)
+ .align(SWT.FILL, SWT.FILL).applyTo(container);
createApplicationSelectionGroup(container, dbc);
createApplicationConfigurationGroup(container, dbc);
}
- private Composite createApplicationSelectionGroup(Composite container, DataBindingContext dbc) {
+ private Composite createApplicationSelectionGroup(Composite container,
+ DataBindingContext dbc) {
Composite existingAppSelectionGroup = new Composite(container, SWT.NONE);
// projectGroup.setText("Project");
- GridDataFactory.fillDefaults().align(SWT.LEFT, SWT.CENTER).align(SWT.FILL, SWT.CENTER).grab(true, false)
+ GridDataFactory.fillDefaults().align(SWT.LEFT, SWT.CENTER)
+ .align(SWT.FILL, SWT.CENTER).grab(true, false)
.applyTo(existingAppSelectionGroup);
- GridLayoutFactory.fillDefaults().numColumns(3).margins(6, 6).applyTo(existingAppSelectionGroup);
+ GridLayoutFactory.fillDefaults().numColumns(3).margins(6, 6)
+ .applyTo(existingAppSelectionGroup);
// existing app checkbox
useExistingAppBtn = new Button(existingAppSelectionGroup, SWT.CHECK);
useExistingAppBtn.setText("Use existing application:");
- useExistingAppBtn.setToolTipText("Select an existing application or uncheck to create a new one.");
+ useExistingAppBtn
+ .setToolTipText("Select an existing application or uncheck to create a new one.");
useExistingAppBtn.setFocus();
- GridDataFactory.fillDefaults().span(1, 1).align(SWT.FILL, SWT.CENTER).grab(false, false)
- .applyTo(useExistingAppBtn);
- IObservableValue useExistingAppObservable = BeanProperties.value(
- ApplicationConfigurationWizardPageModel.PROPERTY_USE_EXISTING_APPLICATION).observe(pageModel);
- final IObservableValue useExistingAppBtnSelection = WidgetProperties.selection().observe(useExistingAppBtn);
+ GridDataFactory.fillDefaults().span(1, 1).align(SWT.FILL, SWT.CENTER)
+ .grab(false, false).applyTo(useExistingAppBtn);
+ IObservableValue useExistingAppObservable = BeanProperties
+ .value(ApplicationConfigurationWizardPageModel.PROPERTY_USE_EXISTING_APPLICATION)
+ .observe(pageModel);
+ final IObservableValue useExistingAppBtnSelection = WidgetProperties
+ .selection().observe(useExistingAppBtn);
dbc.bindValue(useExistingAppBtnSelection, useExistingAppObservable);
// existing app name
- this.existingAppNameText = new Text(existingAppSelectionGroup, SWT.BORDER);
- GridDataFactory.fillDefaults().align(SWT.FILL, SWT.CENTER).span(1, 1).grab(true, false)
- .applyTo(existingAppNameText);
- IObservableValue existingAppNameTextObservable = WidgetProperties.text(SWT.Modify).observe(existingAppNameText);
- IObservableValue existingAppNameModelObservable = BeanProperties.value(
- ApplicationConfigurationWizardPageModel.PROPERTY_EXISTING_APPLICATION_NAME).observe(pageModel);
- ValueBindingBuilder.bind(existingAppNameTextObservable).to(existingAppNameModelObservable).in(dbc);
+ this.existingAppNameText = new Text(existingAppSelectionGroup,
+ SWT.BORDER);
+ GridDataFactory.fillDefaults().align(SWT.FILL, SWT.CENTER).span(1, 1)
+ .grab(true, false).applyTo(existingAppNameText);
+ IObservableValue existingAppNameTextObservable = WidgetProperties.text(
+ SWT.Modify).observe(existingAppNameText);
+ IObservableValue existingAppNameModelObservable = BeanProperties
+ .value(ApplicationConfigurationWizardPageModel.PROPERTY_EXISTING_APPLICATION_NAME)
+ .observe(pageModel);
+ ValueBindingBuilder.bind(existingAppNameTextObservable)
+ .to(existingAppNameModelObservable).in(dbc);
UIUtils.focusOnSelection(useExistingAppBtn, existingAppNameText);
createExistingAppNameContentAssist();
this.browseAppsButton = new Button(existingAppSelectionGroup, SWT.NONE);
browseAppsButton.setText("Browse...");
browseAppsButton.addSelectionListener(onBrowseApps());
- GridDataFactory.fillDefaults().align(SWT.LEFT, SWT.CENTER).hint(100, SWT.DEFAULT).span(1, 1).grab(false, false)
+ GridDataFactory.fillDefaults().align(SWT.LEFT, SWT.CENTER)
+ .hint(100, SWT.DEFAULT).span(1, 1).grab(false, false)
.applyTo(browseAppsButton);
// observe the list of application, get notified once they have been
- IObservableValue existingApplicationsLoaded =
- BeanProperties.value(ApplicationConfigurationWizardPageModel.PROPERTY_EXISTING_APPLICATIONS_LOADED)
- .observe(pageModel);
- final ApplicationToSelectNameValidator existingAppValidator =
- new ApplicationToSelectNameValidator(
- useExistingAppBtnSelection, existingAppNameTextObservable, existingApplicationsLoaded);
+ IObservableValue existingApplicationsLoaded = BeanProperties
+ .value(ApplicationConfigurationWizardPageModel.PROPERTY_EXISTING_APPLICATIONS_LOADED)
+ .observe(pageModel);
+ final ApplicationToSelectNameValidator existingAppValidator = new ApplicationToSelectNameValidator(
+ useExistingAppBtnSelection, existingAppNameTextObservable,
+ existingApplicationsLoaded);
dbc.addValidationStatusProvider(existingAppValidator);
- ControlDecorationSupport.create(existingAppValidator, SWT.LEFT | SWT.TOP, null,
- new CustomControlDecorationUpdater(false));
+ ControlDecorationSupport.create(existingAppValidator, SWT.LEFT
+ | SWT.TOP, null, new CustomControlDecorationUpdater(false));
return existingAppSelectionGroup;
}
private void createExistingAppNameContentAssist() {
- ControlDecoration dec = new ControlDecoration(existingAppNameText, SWT.TOP | SWT.LEFT);
- FieldDecoration contentProposalFieldIndicator = FieldDecorationRegistry.getDefault().getFieldDecoration(
- FieldDecorationRegistry.DEC_CONTENT_PROPOSAL);
+ ControlDecoration dec = new ControlDecoration(existingAppNameText,
+ SWT.TOP | SWT.LEFT);
+ FieldDecoration contentProposalFieldIndicator = FieldDecorationRegistry
+ .getDefault().getFieldDecoration(
+ FieldDecorationRegistry.DEC_CONTENT_PROPOSAL);
dec.setImage(contentProposalFieldIndicator.getImage());
dec.setDescriptionText("Auto-completion is enabled when you start typing an application name.");
dec.setShowOnlyOnFocus(true);
- AutoCompleteField adapter = new AutoCompleteField(existingAppNameText, new TextContentAdapter(),
- new String[] {});
+ AutoCompleteField adapter = new AutoCompleteField(existingAppNameText,
+ new TextContentAdapter(), new String[] {});
adapter.setProposals(pageModel.getApplicationNames());
}
@@ -200,17 +226,23 @@
@Override
public void widgetSelected(SelectionEvent e) {
final ApplicationSelectionDialog appSelectionDialog = new ApplicationSelectionDialog(
- (OpenShiftExpressApplicationWizard) getWizard(), null, getShell());
+ (OpenShiftExpressApplicationWizard) getWizard(), null,
+ getShell());
final int result = appSelectionDialog.open();
if (result == IDialogConstants.OK_ID) {
- final IApplication selectedApplication = appSelectionDialog.getSelectedApplication();
+ final IApplication selectedApplication = appSelectionDialog
+ .getSelectedApplication();
if (selectedApplication != null) {
try {
- pageModel.setExistingApplication(selectedApplication);
+ pageModel
+ .setExistingApplication(selectedApplication);
} catch (OpenShiftException ex) {
- OpenShiftUIActivator.log(OpenShiftUIActivator.createErrorStatus(NLS.bind(
- "Could not get embedded cartridges for application {0}",
- selectedApplication.getName()), ex));
+ OpenShiftUIActivator
+ .log(OpenShiftUIActivator.createErrorStatus(
+ NLS.bind(
+ "Could not get embedded cartridges for application {0}",
+ selectedApplication
+ .getName()), ex));
}
}
}
@@ -218,86 +250,113 @@
};
}
- private void createApplicationConfigurationGroup(Composite parent, DataBindingContext dbc) {
+ private void createApplicationConfigurationGroup(Composite parent,
+ DataBindingContext dbc) {
this.newAppConfigurationGroup = new Group(parent, SWT.NONE);
newAppConfigurationGroup.setText("New application");
- GridLayoutFactory.fillDefaults().numColumns(2).margins(6, 6).applyTo(newAppConfigurationGroup);
- GridDataFactory.fillDefaults().grab(true, true).align(SWT.FILL, SWT.FILL).applyTo(newAppConfigurationGroup);
+ GridLayoutFactory.fillDefaults().numColumns(2).margins(6, 6)
+ .applyTo(newAppConfigurationGroup);
+ GridDataFactory.fillDefaults().grab(true, true)
+ .align(SWT.FILL, SWT.FILL).applyTo(newAppConfigurationGroup);
- IObservableValue useExistingApplication = WidgetProperties.selection().observe(useExistingAppBtn);
+ IObservableValue useExistingApplication = WidgetProperties.selection()
+ .observe(useExistingAppBtn);
- useExistingApplication.addValueChangeListener(
- onUseExistingApplication(
- newAppConfigurationGroup, existingAppNameText, browseAppsButton));
+ useExistingApplication
+ .addValueChangeListener(onUseExistingApplication(
+ newAppConfigurationGroup, existingAppNameText,
+ browseAppsButton));
this.newAppNameLabel = new Label(newAppConfigurationGroup, SWT.NONE);
newAppNameLabel.setText("Name:");
- GridDataFactory.fillDefaults().align(SWT.FILL, SWT.CENTER).applyTo(newAppNameLabel);
+ GridDataFactory.fillDefaults().align(SWT.FILL, SWT.CENTER)
+ .applyTo(newAppNameLabel);
this.newAppNameText = new Text(newAppConfigurationGroup, SWT.BORDER);
- GridDataFactory.fillDefaults().grab(true, false).align(SWT.FILL, SWT.FILL).applyTo(newAppNameText);
+ GridDataFactory.fillDefaults().grab(true, false)
+ .align(SWT.FILL, SWT.FILL).applyTo(newAppNameText);
UIUtils.selectAllOnFocus(newAppNameText);
- final IObservableValue applicationNameTextObservable = WidgetProperties.text(SWT.Modify)
- .observe(newAppNameText);
- final IObservableValue applicationNameModelObservable = BeanProperties.value(
- ApplicationConfigurationWizardPageModel.PROPERTY_APPLICATION_NAME).observe(pageModel);
- ValueBindingBuilder.bind(applicationNameTextObservable).to(applicationNameModelObservable).in(dbc);
+ final IObservableValue applicationNameTextObservable = WidgetProperties
+ .text(SWT.Modify).observe(newAppNameText);
+ final IObservableValue applicationNameModelObservable = BeanProperties
+ .value(ApplicationConfigurationWizardPageModel.PROPERTY_APPLICATION_NAME)
+ .observe(pageModel);
+ ValueBindingBuilder.bind(applicationNameTextObservable)
+ .to(applicationNameModelObservable).in(dbc);
this.newAppTypeLabel = new Label(newAppConfigurationGroup, SWT.NONE);
newAppTypeLabel.setText("Type:");
- GridDataFactory.fillDefaults().align(SWT.FILL, SWT.CENTER).span(1, 1).applyTo(newAppTypeLabel);
- this.newAppCartridgeCombo = new Combo(newAppConfigurationGroup, SWT.BORDER | SWT.READ_ONLY);
- GridDataFactory.fillDefaults().align(SWT.FILL, SWT.CENTER).span(1, 1).grab(true, false)
- .applyTo(newAppCartridgeCombo);
+ GridDataFactory.fillDefaults().align(SWT.FILL, SWT.CENTER).span(1, 1)
+ .applyTo(newAppTypeLabel);
+ this.newAppCartridgeCombo = new Combo(newAppConfigurationGroup,
+ SWT.BORDER | SWT.READ_ONLY);
+ GridDataFactory.fillDefaults().align(SWT.FILL, SWT.CENTER).span(1, 1)
+ .grab(true, false).applyTo(newAppCartridgeCombo);
fillCartridgesCombo(dbc, newAppCartridgeCombo);
- final ISWTObservableValue selectedCartridgeComboObservable = WidgetProperties.selection().observe(
- newAppCartridgeCombo);
- final IObservableValue selectedCartridgeModelObservable = BeanProperties.value(
- NewApplicationWizardPageModel.PROPERTY_SELECTED_CARTRIDGE).observe(pageModel);
- ValueBindingBuilder.bind(selectedCartridgeComboObservable).converting(new StringToCartridgeConverter())
- .to(selectedCartridgeModelObservable).converting(new CartridgeToStringConverter()).in(dbc);
+ final ISWTObservableValue selectedCartridgeComboObservable = WidgetProperties
+ .selection().observe(newAppCartridgeCombo);
+ final IObservableValue selectedCartridgeModelObservable = BeanProperties
+ .value(NewApplicationWizardPageModel.PROPERTY_SELECTED_CARTRIDGE)
+ .observe(pageModel);
+ ValueBindingBuilder.bind(selectedCartridgeComboObservable)
+ .converting(new StringToCartridgeConverter())
+ .to(selectedCartridgeModelObservable)
+ .converting(new CartridgeToStringConverter()).in(dbc);
- final ISWTObservableValue useExistingAppBtnSelection = WidgetProperties.selection().observe(useExistingAppBtn);
+ final ISWTObservableValue useExistingAppBtnSelection = WidgetProperties
+ .selection().observe(useExistingAppBtn);
final NewApplicationNameValidator newApplicationNameValidator = new NewApplicationNameValidator(
useExistingAppBtnSelection, applicationNameTextObservable);
dbc.addValidationStatusProvider(newApplicationNameValidator);
- ControlDecorationSupport.create(newApplicationNameValidator, SWT.LEFT | SWT.TOP, null,
- new CustomControlDecorationUpdater());
+ ControlDecorationSupport.create(newApplicationNameValidator, SWT.LEFT
+ | SWT.TOP, null, new CustomControlDecorationUpdater());
final NewApplicationTypeValidator newApplicationTypeValidator = new NewApplicationTypeValidator(
useExistingAppBtnSelection, selectedCartridgeComboObservable);
dbc.addValidationStatusProvider(newApplicationTypeValidator);
- ControlDecorationSupport.create(newApplicationTypeValidator, SWT.LEFT | SWT.TOP, null,
- new CustomControlDecorationUpdater());
+ ControlDecorationSupport.create(newApplicationTypeValidator, SWT.LEFT
+ | SWT.TOP, null, new CustomControlDecorationUpdater());
// embeddable cartridges
- this.newAppEmbeddableCartridgesGroup = new Group(newAppConfigurationGroup, SWT.NONE);
+ this.newAppEmbeddableCartridgesGroup = new Group(
+ newAppConfigurationGroup, SWT.NONE);
newAppEmbeddableCartridgesGroup.setText("Embeddable Cartridges");
- GridDataFactory.fillDefaults().grab(true, true).align(SWT.FILL, SWT.FILL).span(2, 1)
+ GridDataFactory.fillDefaults().grab(true, true)
+ .align(SWT.FILL, SWT.FILL).span(2, 1)
.applyTo(newAppEmbeddableCartridgesGroup);
- GridLayoutFactory.fillDefaults().numColumns(2).margins(6, 6).applyTo(newAppEmbeddableCartridgesGroup);
+ GridLayoutFactory.fillDefaults().numColumns(2).margins(6, 6)
+ .applyTo(newAppEmbeddableCartridgesGroup);
- Composite tableContainer = new Composite(newAppEmbeddableCartridgesGroup, SWT.NONE);
- GridDataFactory.fillDefaults().align(SWT.FILL, SWT.FILL).grab(true, true).span(1, 2).hint(400, 250)
+ Composite tableContainer = new Composite(
+ newAppEmbeddableCartridgesGroup, SWT.NONE);
+ GridDataFactory.fillDefaults().align(SWT.FILL, SWT.FILL)
+ .grab(true, true).span(1, 2).hint(400, 250)
.applyTo(tableContainer);
this.viewer = createTable(tableContainer);
- dbc.bindSet(ViewerProperties.checkedElements(IEmbeddableCartridge.class).observe(viewer),
- BeanProperties.set(ApplicationConfigurationWizardPageModel.PROPERTY_SELECTED_EMBEDDABLE_CARTRIDGES)
+ dbc.bindSet(
+ ViewerProperties.checkedElements(IEmbeddableCartridge.class)
+ .observe(viewer),
+ BeanProperties
+ .set(ApplicationConfigurationWizardPageModel.PROPERTY_SELECTED_EMBEDDABLE_CARTRIDGES)
.observe(pageModel));
- this.checkAllButton = new Button(newAppEmbeddableCartridgesGroup, SWT.PUSH);
+ this.checkAllButton = new Button(newAppEmbeddableCartridgesGroup,
+ SWT.PUSH);
checkAllButton.setText("&Select All");
- GridDataFactory.fillDefaults().hint(110, SWT.DEFAULT).grab(false, false).align(SWT.FILL, SWT.TOP)
+ GridDataFactory.fillDefaults().hint(110, SWT.DEFAULT)
+ .grab(false, false).align(SWT.FILL, SWT.TOP)
.applyTo(checkAllButton);
checkAllButton.addSelectionListener(onCheckAll());
- this.uncheckAllButton = new Button(newAppEmbeddableCartridgesGroup, SWT.PUSH);
+ this.uncheckAllButton = new Button(newAppEmbeddableCartridgesGroup,
+ SWT.PUSH);
uncheckAllButton.setText("&Deselect All");
- GridDataFactory.fillDefaults().hint(110, SWT.DEFAULT).grab(false, true).align(SWT.FILL, SWT.TOP)
- .applyTo(uncheckAllButton);
+ GridDataFactory.fillDefaults().hint(110, SWT.DEFAULT).grab(false, true)
+ .align(SWT.FILL, SWT.TOP).applyTo(uncheckAllButton);
uncheckAllButton.addSelectionListener(onUncheckAll());
// bottom filler
Composite spacer = new Composite(newAppConfigurationGroup, SWT.NONE);
- GridDataFactory.fillDefaults().span(2, 1).align(SWT.FILL, SWT.FILL).grab(true, true).applyTo(spacer);
+ GridDataFactory.fillDefaults().span(2, 1).align(SWT.FILL, SWT.FILL)
+ .grab(true, true).applyTo(spacer);
}
/**
@@ -309,7 +368,8 @@
* @param applicationBrowseButton
* @return
*/
- private IValueChangeListener onUseExistingApplication(final Group applicationConfigurationGroup,
+ private IValueChangeListener onUseExistingApplication(
+ final Group applicationConfigurationGroup,
final Text applicationNameText, final Button applicationBrowseButton) {
return new IValueChangeListener() {
@@ -318,9 +378,9 @@
Object newValue = event.diff.getNewValue();
if (newValue instanceof Boolean) {
Boolean useExisting = (Boolean) newValue;
-// if (!useExisting) {
-// resetExistingApplication();
-// }
+ // if (!useExisting) {
+ // resetExistingApplication();
+ // }
enableApplicationWidgets(useExisting);
}
}
@@ -328,7 +388,8 @@
}
/**
- * Enables/disables the given widgets based on the flag to use an existing app or create a new application.
+ * Enables/disables the given widgets based on the flag to use an existing
+ * app or create a new application.
*
* @param useExisting
* @param applicationConfigurationGroup
@@ -348,16 +409,21 @@
}, newAppConfigurationGroup);
}
- private void fillCartridgesCombo(DataBindingContext dbc, Combo cartridgesCombo) {
- dbc.bindList(WidgetProperties.items().observe(cartridgesCombo),
- BeanProperties.list(ApplicationConfigurationWizardPageModel.PROPERTY_CARTRIDGES).observe(pageModel),
- new UpdateListStrategy(UpdateListStrategy.POLICY_NEVER),
- new UpdateListStrategy().setConverter(new CartridgeToStringConverter()));
+ private void fillCartridgesCombo(DataBindingContext dbc,
+ Combo cartridgesCombo) {
+ dbc.bindList(
+ WidgetProperties.items().observe(cartridgesCombo),
+ BeanProperties
+ .list(ApplicationConfigurationWizardPageModel.PROPERTY_CARTRIDGES)
+ .observe(pageModel), new UpdateListStrategy(
+ UpdateListStrategy.POLICY_NEVER),
+ new UpdateListStrategy()
+ .setConverter(new CartridgeToStringConverter()));
}
protected CheckboxTableViewer createTable(Composite tableContainer) {
- Table table = new Table(tableContainer, SWT.BORDER | SWT.FULL_SELECTION | SWT.V_SCROLL | SWT.H_SCROLL
- | SWT.CHECK);
+ Table table = new Table(tableContainer, SWT.BORDER | SWT.FULL_SELECTION
+ | SWT.V_SCROLL | SWT.H_SCROLL | SWT.CHECK);
table.setLinesVisible(true);
TableColumnLayout tableLayout = new TableColumnLayout();
tableContainer.setLayout(tableLayout);
@@ -369,19 +435,22 @@
@Override
public void update(ViewerCell cell) {
- IEmbeddableCartridge cartridge = (IEmbeddableCartridge) cell.getElement();
+ IEmbeddableCartridge cartridge = (IEmbeddableCartridge) cell
+ .getElement();
cell.setText(cartridge.getName());
}
}, viewer, tableLayout);
return viewer;
}
- private void createTableColumn(String name, int weight, CellLabelProvider cellLabelProvider, TableViewer viewer,
+ private void createTableColumn(String name, int weight,
+ CellLabelProvider cellLabelProvider, TableViewer viewer,
TableColumnLayout layout) {
TableViewerColumn column = new TableViewerColumn(viewer, SWT.LEFT);
column.getColumn().setText(name);
column.setLabelProvider(cellLabelProvider);
- layout.setColumnData(column.getColumn(), new ColumnWeightData(weight, true));
+ layout.setColumnData(column.getColumn(), new ColumnWeightData(weight,
+ true));
}
private ICheckStateListener onCartridgeChecked() {
@@ -390,11 +459,14 @@
@Override
public void checkStateChanged(CheckStateChangedEvent event) {
try {
- IEmbeddableCartridge cartridge = (IEmbeddableCartridge) event.getElement();
+ IEmbeddableCartridge cartridge = (IEmbeddableCartridge) event
+ .getElement();
if (event.getChecked()) {
- if (IEmbeddableCartridge.PHPMYADMIN_34.equals(cartridge)) {
+ if (IEmbeddableCartridge.PHPMYADMIN_34
+ .equals(cartridge)) {
addPhpMyAdminCartridge(cartridge);
- } else if (IEmbeddableCartridge.JENKINS_14.equals(cartridge)) {
+ } else if (IEmbeddableCartridge.JENKINS_14
+ .equals(cartridge)) {
addJenkinsCartridge(cartridge);
} else {
addCartridge(cartridge);
@@ -407,17 +479,20 @@
}
}
} catch (OpenShiftException e) {
- OpenShiftUIActivator.log("Could not process embeddable cartridges", e);
+ OpenShiftUIActivator.log(
+ "Could not process embeddable cartridges", e);
}
}
};
}
- private void addJenkinsCartridge(final IEmbeddableCartridge cartridge) throws OpenShiftException {
+ private void addJenkinsCartridge(final IEmbeddableCartridge cartridge)
+ throws OpenShiftException {
if (pageModel.hasApplication(ICartridge.JENKINS_14)) {
pageModel.getSelectedEmbeddableCartridges().add(cartridge);
} else {
- final JenkinsApplicationDialog dialog = new JenkinsApplicationDialog(getShell());
+ final JenkinsApplicationDialog dialog = new JenkinsApplicationDialog(
+ getShell());
if (dialog.open() == Dialog.OK) {
createJenkinsApplication(cartridge, dialog.getValue());
} else {
@@ -426,41 +501,52 @@
}
}
- private void createJenkinsApplication(final IEmbeddableCartridge cartridge, final String name) {
+ private void createJenkinsApplication(final IEmbeddableCartridge cartridge,
+ final String name) {
try {
- WizardUtils.runInWizard(new Job(NLS.bind("Creating jenkins application \"{0}\"...", name)) {
+ WizardUtils.runInWizard(
+ new Job(NLS.bind("Creating jenkins application \"{0}\"...",
+ name)) {
- @Override
- protected IStatus run(IProgressMonitor monitor) {
- try {
- IApplication jenkinsApplication = pageModel.createJenkinsApplication(name, monitor);
- pageModel.getSelectedEmbeddableCartridges().add(cartridge);
+ @Override
+ protected IStatus run(IProgressMonitor monitor) {
+ try {
+ IApplication jenkinsApplication = pageModel
+ .createJenkinsApplication(name, monitor);
+ pageModel.getSelectedEmbeddableCartridges()
+ .add(cartridge);
- openLogDialog(jenkinsApplication);
+ openLogDialog(jenkinsApplication);
- return Status.OK_STATUS;
- } catch (Exception e) {
- getShell().getDisplay().syncExec(new Runnable() {
- @Override
- public void run() {
- viewer.setChecked(cartridge, false);
+ return Status.OK_STATUS;
+ } catch (Exception e) {
+ getShell().getDisplay().syncExec(
+ new Runnable() {
+ @Override
+ public void run() {
+ viewer.setChecked(cartridge,
+ false);
+ }
+ });
+ return OpenShiftUIActivator.createErrorStatus(
+ "Could not load embeddable cartridges",
+ e);
}
- });
- return OpenShiftUIActivator.createErrorStatus("Could not load embeddable cartridges", e);
- }
- }
+ }
- }, getContainer(), getDataBindingContext());
+ }, getContainer(), getDataBindingContext());
} catch (Exception e) {
// ignore
}
}
- private void addPhpMyAdminCartridge(IEmbeddableCartridge cartridge) throws OpenShiftException {
+ private void addPhpMyAdminCartridge(IEmbeddableCartridge cartridge)
+ throws OpenShiftException {
if (!viewer.getChecked(IEmbeddableCartridge.MYSQL_51)) {
if (MessageDialog.openQuestion(getShell(), "Embed mysql cartridge",
"To embed phpmyadmin, you'd also have to embed mysql.")) {
- pageModel.getSelectedEmbeddableCartridges().add(IEmbeddableCartridge.MYSQL_51);
+ pageModel.getSelectedEmbeddableCartridges().add(
+ IEmbeddableCartridge.MYSQL_51);
pageModel.getSelectedEmbeddableCartridges().add(cartridge);
viewer.setChecked(IEmbeddableCartridge.MYSQL_51, true);
} else {
@@ -471,15 +557,19 @@
}
}
- private void addCartridge(IEmbeddableCartridge cartridge) throws OpenShiftException {
+ private void addCartridge(IEmbeddableCartridge cartridge)
+ throws OpenShiftException {
pageModel.getSelectedEmbeddableCartridges().add(cartridge);
}
- private void removeMySQLCartridge(IEmbeddableCartridge cartridge) throws OpenShiftException {
- Set<IEmbeddableCartridge> checkedCartridges = pageModel.getSelectedEmbeddableCartridges();
+ private void removeMySQLCartridge(IEmbeddableCartridge cartridge)
+ throws OpenShiftException {
+ Set<IEmbeddableCartridge> checkedCartridges = pageModel
+ .getSelectedEmbeddableCartridges();
if (viewer.getChecked(IEmbeddableCartridge.PHPMYADMIN_34)) {
- if (MessageDialog.openQuestion(getShell(), "Remove phpmyadmin cartridge",
- "If you remove the mysql cartridge, you'd also have to remove phpmyadmin.")) {
+ if (MessageDialog
+ .openQuestion(getShell(), "Remove phpmyadmin cartridge",
+ "If you remove the mysql cartridge, you'd also have to remove phpmyadmin.")) {
checkedCartridges.remove(IEmbeddableCartridge.PHPMYADMIN_34);
checkedCartridges.remove(cartridge);
viewer.setChecked(IEmbeddableCartridge.PHPMYADMIN_34, false);
@@ -491,7 +581,8 @@
}
}
- private void removeCartridge(IEmbeddableCartridge cartridge) throws OpenShiftException {
+ private void removeCartridge(IEmbeddableCartridge cartridge)
+ throws OpenShiftException {
pageModel.getSelectedEmbeddableCartridges().remove(cartridge);
}
@@ -504,7 +595,8 @@
try {
addJenkinsCartridge(IEmbeddableCartridge.JENKINS_14);
} catch (OpenShiftException ex) {
- OpenShiftUIActivator.log("Could not select jenkins cartridge", ex);
+ OpenShiftUIActivator.log(
+ "Could not select jenkins cartridge", ex);
}
}
@@ -522,7 +614,8 @@
};
}
- private void setViewerInput(final Collection<IEmbeddableCartridge> cartridges) {
+ private void setViewerInput(
+ final Collection<IEmbeddableCartridge> cartridges) {
getShell().getDisplay().syncExec(new Runnable() {
@Override
public void run() {
@@ -554,7 +647,8 @@
@Override
public Object convert(Object fromObject) {
- if (fromObject instanceof String && ((String) fromObject).length() > 0) {
+ if (fromObject instanceof String
+ && ((String) fromObject).length() > 0) {
return new Cartridge(((String) fromObject));
}
return null;
@@ -564,9 +658,12 @@
private static class JenkinsApplicationDialog extends InputDialog {
public JenkinsApplicationDialog(Shell shell) {
- super(shell, "New Jenkins application",
+ super(
+ shell,
+ "New Jenkins application",
"To embed jenkins into your application, you'd first have to create a jenkins application.\n"
- + "Please provide a name for your jenkins application:", null, new JenkinsNameValidator());
+ + "Please provide a name for your jenkins application:",
+ null, new JenkinsNameValidator());
}
private static class JenkinsNameValidator implements IInputValidator {
@@ -592,11 +689,12 @@
}
/**
- * Viewer element comparer based on #equals(). The default implementation in CheckboxTableViewer compares elements
- * based on instance identity.
+ * Viewer element comparer based on #equals(). The default implementation in
+ * CheckboxTableViewer compares elements based on instance identity.
* <p>
- * We need this since the available cartridges (item listed in the viewer) are not the same instance as the ones in
- * the embedded application (items to check in the viewer).
+ * We need this since the available cartridges (item listed in the viewer)
+ * are not the same instance as the ones in the embedded application (items
+ * to check in the viewer).
*/
private static class EqualityComparer implements IElementComparer {
@@ -629,7 +727,8 @@
Display.getDefault().asyncExec(new Runnable() {
public void run() {
loadOpenshiftResources(dbc);
- enableApplicationWidgets(pageModel.isUseExistingApplication());
+ enableApplicationWidgets(pageModel
+ .isUseExistingApplication());
createExistingAppNameContentAssist();
// this is needed because of weird issues with UI not
// reacting to model changes while wizard runnable is
@@ -642,7 +741,8 @@
}
@Override
- protected void onPageWillGetActivated(Direction direction, PageChangingEvent event, DataBindingContext dbc) {
+ protected void onPageWillGetActivated(Direction direction,
+ PageChangingEvent event, DataBindingContext dbc) {
if (direction == Direction.BACKWARDS) {
return;
}
@@ -650,15 +750,17 @@
final IUser user = this.pageModel.getUser();
if (user != null && !user.hasDomain()) {
IWizard domainDialog = new NewDomainDialog(user);
- WizardDialog dialog = new WizardDialog(Display.getCurrent().getActiveShell(), domainDialog);
+ WizardDialog dialog = new WizardDialog(Display.getCurrent()
+ .getActiveShell(), domainDialog);
dialog.create();
dialog.setBlockOnOpen(true);
int result = dialog.open();
- if(result != Dialog.OK) {
- final IWizardContainer container = getWizard().getContainer();
- if(container instanceof WizardDialog) {
+ if (result != Dialog.OK) {
+ final IWizardContainer container = getWizard()
+ .getContainer();
+ if (container instanceof WizardDialog) {
event.doit = false;
- ((WizardDialog)container).close();
+ ((WizardDialog) container).close();
}
}
}
@@ -669,47 +771,57 @@
protected void loadOpenshiftResources(final DataBindingContext dbc) {
try {
- WizardUtils.runInWizard(new Job("Loading existing applications...") {
- @Override
- protected IStatus run(IProgressMonitor monitor) {
- try {
- pageModel.loadExistingApplications();
- return Status.OK_STATUS;
- } catch (NotFoundOpenShiftException e) {
- return Status.OK_STATUS;
- } catch (Exception e) {
- return OpenShiftUIActivator.createErrorStatus("Could not load applications", e);
- }
- }
+ WizardUtils.runInWizard(
+ new Job("Loading existing applications...") {
+ @Override
+ protected IStatus run(IProgressMonitor monitor) {
+ try {
+ pageModel.loadExistingApplications();
+ return Status.OK_STATUS;
+ } catch (NotFoundOpenShiftException e) {
+ return Status.OK_STATUS;
+ } catch (Exception e) {
+ return OpenShiftUIActivator.createErrorStatus(
+ "Could not load applications", e);
+ }
+ }
- }, getContainer(), dbc);
+ }, getContainer(), dbc);
- WizardUtils.runInWizard(new Job("Loading application cartridges...") {
- @Override
- protected IStatus run(IProgressMonitor monitor) {
- try {
- pageModel.loadCartridges();
- return Status.OK_STATUS;
- } catch (NotFoundOpenShiftException e) {
- return Status.OK_STATUS;
- } catch (Exception e) {
- return OpenShiftUIActivator.createErrorStatus("Could not load application cartridges", e);
- }
- }
- }, getContainer(), dbc);
- WizardUtils.runInWizard(new Job("Loading embeddable cartridges...") {
- @Override
- protected IStatus run(IProgressMonitor monitor) {
- try {
- setViewerInput(pageModel.loadEmbeddableCartridges());
- return Status.OK_STATUS;
- } catch (NotFoundOpenShiftException e) {
- return Status.OK_STATUS;
- } catch (Exception e) {
- return OpenShiftUIActivator.createErrorStatus("Could not load embeddable cartridges", e);
- }
- }
- }, getContainer(), dbc);
+ WizardUtils.runInWizard(
+ new Job("Loading application cartridges...") {
+ @Override
+ protected IStatus run(IProgressMonitor monitor) {
+ try {
+ pageModel.loadCartridges();
+ return Status.OK_STATUS;
+ } catch (NotFoundOpenShiftException e) {
+ return Status.OK_STATUS;
+ } catch (Exception e) {
+ return OpenShiftUIActivator
+ .createErrorStatus(
+ "Could not load application cartridges",
+ e);
+ }
+ }
+ }, getContainer(), dbc);
+ WizardUtils.runInWizard(
+ new Job("Loading embeddable cartridges...") {
+ @Override
+ protected IStatus run(IProgressMonitor monitor) {
+ try {
+ setViewerInput(pageModel
+ .loadEmbeddableCartridges());
+ return Status.OK_STATUS;
+ } catch (NotFoundOpenShiftException e) {
+ return Status.OK_STATUS;
+ } catch (Exception e) {
+ return OpenShiftUIActivator.createErrorStatus(
+ "Could not load embeddable cartridges",
+ e);
+ }
+ }
+ }, getContainer(), dbc);
} catch (Exception ex) {
// ignore
}
@@ -721,8 +833,10 @@
private final IObservableValue existingAppNameTextObservable;
private final IObservableValue existingApplicationsLoadedObservable;
- public ApplicationToSelectNameValidator(IObservableValue useExistingAppBtnbservable,
- IObservableValue existingAppNameTextObservable, IObservableValue existingApplicationsLoadedObservable) {
+ public ApplicationToSelectNameValidator(
+ IObservableValue useExistingAppBtnbservable,
+ IObservableValue existingAppNameTextObservable,
+ IObservableValue existingApplicationsLoadedObservable) {
this.useExistingAppBtnbservable = useExistingAppBtnbservable;
this.existingAppNameTextObservable = existingAppNameTextObservable;
this.existingApplicationsLoadedObservable = existingApplicationsLoadedObservable;
@@ -730,24 +844,32 @@
@Override
protected IStatus validate() {
- final boolean useExistingApp = (Boolean) useExistingAppBtnbservable.getValue();
- final String appName = (String) existingAppNameTextObservable.getValue();
- final Boolean existingApplicationsLoaded = (Boolean) existingApplicationsLoadedObservable.getValue();
+ final boolean useExistingApp = (Boolean) useExistingAppBtnbservable
+ .getValue();
+ final String appName = (String) existingAppNameTextObservable
+ .getValue();
+ final Boolean existingApplicationsLoaded = (Boolean) existingApplicationsLoadedObservable
+ .getValue();
if (!useExistingApp) {
return ValidationStatus.ok();
}
if (StringUtils.isEmpty(appName)) {
- return ValidationStatus.cancel("Please select an existing OpenShift application");
+ return ValidationStatus
+ .cancel("Please select an existing OpenShift application");
}
if (existingApplicationsLoaded != null
&& !existingApplicationsLoaded) {
- return ValidationStatus.cancel("Existing applications are not loaded yet.");
+ return ValidationStatus
+ .cancel("Existing applications are not loaded yet.");
} else {
if (!pageModel.hasApplication(appName)) {
- return ValidationStatus.error(NLS.bind("The application \"{0}\" does not exist.", appName));
+ return ValidationStatus
+ .error(NLS.bind(
+ "The application \"{0}\" does not exist.",
+ appName));
}
}
@@ -769,7 +891,8 @@
private final IObservableValue useExistingAppbservable;
private final IObservableValue applicationNameObservable;
- public NewApplicationNameValidator(IObservableValue useExistingAppObservable,
+ public NewApplicationNameValidator(
+ IObservableValue useExistingAppObservable,
IObservableValue applicationNameObservable) {
this.useExistingAppbservable = useExistingAppObservable;
this.applicationNameObservable = applicationNameObservable;
@@ -777,32 +900,35 @@
@Override
protected IStatus validate() {
- final String applicationName = (String) applicationNameObservable.getValue();
- final boolean useExistingApp = (Boolean) useExistingAppbservable.getValue();
+ final String applicationName = (String) applicationNameObservable
+ .getValue();
+ final boolean useExistingApp = (Boolean) useExistingAppbservable
+ .getValue();
if (useExistingApp) {
return ValidationStatus.ok();
}
if (applicationName.isEmpty()) {
- return ValidationStatus.cancel(
- "Select an alphanumerical name and a type for the application to create.");
+ return ValidationStatus
+ .cancel("Select an alphanumerical name and a type for the application to create.");
}
if (!StringUtils.isAlphaNumeric(applicationName)) {
- return ValidationStatus.error(
- "The name may only contain lower-case letters and digits.");
+ return ValidationStatus
+ .error("The name may only contain lower-case letters and digits.");
}
if (pageModel.isExistingApplication(applicationName)) {
- return ValidationStatus.error(
- "An application with the same name already exists on OpenShift.");
+ return ValidationStatus
+ .error("An application with the same name already exists on OpenShift.");
}
if (isExistingProject(applicationName)) {
- return ValidationStatus.error(
- NLS.bind("A project {0} already exists in the workspace.", applicationName));
+ return ValidationStatus
+ .warning("A project already exists with the same application name. This can cause problems when importing.");
}
return ValidationStatus.ok();
}
private boolean isExistingProject(String name) {
- IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(name);
+ IProject project = ResourcesPlugin.getWorkspace().getRoot()
+ .getProject(name);
return project.exists();
}
@@ -819,7 +945,8 @@
private final IObservableValue useExistingAppBtnbservable;
private final IObservableValue selectedCartridgeObservable;
- public NewApplicationTypeValidator(IObservableValue useExistingAppBtnbservable,
+ public NewApplicationTypeValidator(
+ IObservableValue useExistingAppBtnbservable,
IObservableValue selectedCartridgeObservable) {
this.useExistingAppBtnbservable = useExistingAppBtnbservable;
this.selectedCartridgeObservable = selectedCartridgeObservable;
@@ -827,8 +954,10 @@
@Override
protected IStatus validate() {
- final boolean useExistingApp = (Boolean) useExistingAppBtnbservable.getValue();
- final String cartridge = (String) selectedCartridgeObservable.getValue();
+ final boolean useExistingApp = (Boolean) useExistingAppBtnbservable
+ .getValue();
+ final String cartridge = (String) selectedCartridgeObservable
+ .getValue();
if (useExistingApp) {
return ValidationStatus.ok();
}
@@ -846,4 +975,9 @@
return targets;
}
}
+
+ protected void setupWizardPageSupport(DataBindingContext dbc) {
+ ParametrizableWizardPageSupport.create(IStatus.ERROR | IStatus.INFO
+ | IStatus.CANCEL, this, dbc);
+ }
}
12 years, 4 months
- 1
- 0
JBoss Tools SVN: r39115 - trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2012-02-24 10:07:46 -0500 (Fri, 24 Feb 2012)
New Revision: 39115
Modified:
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ApplicationConfigurationWizardPage.java
Log:
[JBIDE-11037] changed error to warning iforming the user that the app names could possibly conflict with an existing proj in his workspace
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ApplicationConfigurationWizardPage.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ApplicationConfigurationWizardPage.java 2012-02-24 14:53:20 UTC (rev 39114)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ApplicationConfigurationWizardPage.java 2012-02-24 15:07:46 UTC (rev 39115)
@@ -803,8 +803,8 @@
"An application with the same name already exists on OpenShift.");
}
if (isExistingProject(applicationName)) {
- return ValidationStatus.warning(
- NLS.bind("A project already exists with the same application name. This can cause problems when importing.", applicationName));
+ return ValidationStatus
+ .warning("A project already exists with the same application name. This can cause problems when importing.");
}
return ValidationStatus.ok();
}
12 years, 4 months
- 1
- 0
JBoss Tools SVN: r39114 - in trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim: resources/icons and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: yradtsevich
Date: 2012-02-24 09:53:20 -0500 (Fri, 24 Feb 2012)
New Revision: 39114
Added:
trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/resources/icons/
trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/resources/icons/browsersim_128px.png
trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/resources/icons/browsersim_16px.png
trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/resources/icons/browsersim_256px.png
trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/resources/icons/browsersim_32px.png
trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/resources/icons/browsersim_64px.png
Modified:
trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/ui/BrowserSim.java
Log:
https://issues.jboss.org/browse/JBIDE-11045 : BrowserSim: set taskbar icon for application
Added: trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/resources/icons/browsersim_128px.png
===================================================================
(Binary files differ)
Property changes on: trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/resources/icons/browsersim_128px.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/resources/icons/browsersim_16px.png
===================================================================
(Binary files differ)
Property changes on: trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/resources/icons/browsersim_16px.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/resources/icons/browsersim_256px.png
===================================================================
(Binary files differ)
Property changes on: trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/resources/icons/browsersim_256px.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/resources/icons/browsersim_32px.png
===================================================================
(Binary files differ)
Property changes on: trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/resources/icons/browsersim_32px.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/resources/icons/browsersim_64px.png
===================================================================
(Binary files differ)
Property changes on: trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/resources/icons/browsersim_64px.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Modified: trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/ui/BrowserSim.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/ui/BrowserSim.java 2012-02-24 14:20:06 UTC (rev 39113)
+++ trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/ui/BrowserSim.java 2012-02-24 14:53:20 UTC (rev 39114)
@@ -34,6 +34,7 @@
import org.eclipse.swt.events.MenuEvent;
import org.eclipse.swt.events.SelectionAdapter;
import org.eclipse.swt.events.SelectionEvent;
+import org.eclipse.swt.graphics.Image;
import org.eclipse.swt.graphics.Point;
import org.eclipse.swt.graphics.Rectangle;
import org.eclipse.swt.program.Program;
@@ -52,19 +53,21 @@
import org.jboss.tools.vpe.browsersim.model.DevicesListStorage;
import org.jboss.tools.vpe.browsersim.model.SkinMap;
import org.jboss.tools.vpe.browsersim.ui.skin.BrowserSimSkin;
+import org.jboss.tools.vpe.browsersim.util.ResourcesUtil;
/**
* @author Yahor Radtsevich (yradtsevich)
*/
public class BrowserSim {
private static final String DEFAULT_URL = "about:blank"; //"http://www.w3schools.com/js/tryit_view.asp?filename=try_nav_useragent"; //$NON-NLS-1$
+ private static final String[] BROWSERSIM_ICONS = {"icons/browsersim_16px.png", "icons/browsersim_32px.png", "icons/browsersim_64px.png", "icons/browsersim_128px.png", "icons/browsersim_256px.png", }; //$NON-NLS-1$//$NON-NLS-2$//$NON-NLS-3$//$NON-NLS-4$//$NON-NLS-5$
private Display display;
private String homeUrl;
private DevicesListHolder devicesListHolder;
private DeviceOrientation deviceOrientation;
private BrowserSimSkin skin;
-// private BrowserSimBrowser browser;
private ControlHandler controlHandler;
+ private Image[] icons;
public static void main(String[] args) {
String homeUrl;
@@ -87,7 +90,7 @@
}
Device defaultDevice = devicesList.getDevices().get(devicesList.getSelectedDeviceIndex());
Display display = new Display();
- BrowserSim browserSim = new BrowserSim(display, homeUrl);
+ BrowserSim browserSim = new BrowserSim(display, homeUrl);
browserSim.initSkin(getSkinClass(defaultDevice, devicesList.getUseSkins()));
browserSim.initDevicesListHolder();
browserSim.devicesListHolder.setDevicesList(devicesList);
@@ -98,14 +101,28 @@
if (!display.readAndDispatch())
display.sleep();
}
+ browserSim.dispose();
display.dispose();
}
public BrowserSim(Display display, String homeUrl) {
this.display = display;
this.homeUrl = homeUrl;
+
+ this.icons = new Image[BROWSERSIM_ICONS.length];
+ for (int i = 0; i < BROWSERSIM_ICONS.length; i++) {
+ String iconLocation = BROWSERSIM_ICONS[i];
+ icons[i] = new Image(display, ResourcesUtil.getResourceAsStream(iconLocation));
+ }
}
+ private void dispose() {
+ for (Image icon : icons) {
+ icon.dispose();
+ }
+ icons = null;
+ }
+
public void initSkin(Class<? extends BrowserSimSkin> skinClass) {
try {
skin = skinClass.newInstance();//new AppleIPhone3Skin();//new NativeSkin();
@@ -134,7 +151,7 @@
}
}
});
- shell.setText(Messages.BrowserSim_BROWSER_SIM);
+ setShellAttibutes();
BrowserSimBrowser browser = skin.getBrowser();
controlHandler = new ControlHandlerImpl(browser);
@@ -226,6 +243,14 @@
}
});
}
+
+ private void setShellAttibutes() {
+ Shell shell = skin.getShell();
+ if (shell != null) {
+ shell.setImages(icons);
+ shell.setText(Messages.BrowserSim_BROWSER_SIM);
+ }
+ }
private void initDevicesListHolder() {
devicesListHolder = new DevicesListHolder();
12 years, 4 months
- 1
- 0
JBoss Tools SVN: r39113 - trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/ui.
by jbosstools-commits＠lists.jboss.org
Author: yradtsevich
Date: 2012-02-24 09:20:06 -0500 (Fri, 24 Feb 2012)
New Revision: 39113
Modified:
trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/ui/EditDeviceDialog.java
Log:
Import organizing
Modified: trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/ui/EditDeviceDialog.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/ui/EditDeviceDialog.java 2012-02-24 14:04:50 UTC (rev 39112)
+++ trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/ui/EditDeviceDialog.java 2012-02-24 14:20:06 UTC (rev 39113)
@@ -11,7 +11,6 @@
package org.jboss.tools.vpe.browsersim.ui;
import java.util.ArrayList;
-import java.util.Arrays;
import java.util.Collections;
import java.util.Comparator;
import java.util.List;
12 years, 4 months
- 1
- 0
JBoss Tools SVN: r39112 - trunk/download.jboss.org/jbosstools/updates/indigo.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2012-02-24 09:04:50 -0500 (Fri, 24 Feb 2012)
New Revision: 39112
Modified:
trunk/download.jboss.org/jbosstools/updates/indigo/index.html
Log:
typo
Modified: trunk/download.jboss.org/jbosstools/updates/indigo/index.html
===================================================================
--- trunk/download.jboss.org/jbosstools/updates/indigo/index.html 2012-02-24 13:49:09 UTC (rev 39111)
+++ trunk/download.jboss.org/jbosstools/updates/indigo/index.html 2012-02-24 14:04:50 UTC (rev 39112)
@@ -30,7 +30,7 @@
<p class="bodyText">Available Versions:<ul>
<li><a href=SR2>Indigo SR2</a> & <a href=extras/SR1a>SR1a extras</a> (SR2)</li>
<li><a href=SR1-M>Indigo SR1-M</a> & <a href=extras/SR1a>SR1a extras</a> (post-SR1 maintenance)</li>
- <li><a href=SR1>Indigo SR1</a> & <a href=extras/SR1a>SR1a extras</a></li> (SR1)
+ <li><a href=SR1>Indigo SR1</a> & <a href=extras/SR1a>SR1a extras</a> (SR1)</li>
</ul>
</p>
</td>
12 years, 4 months
- 1
- 0
JBoss Tools SVN: r39111 - in trunk/build: aggregate/site and 5 other directories.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2012-02-24 08:49:09 -0500 (Fri, 24 Feb 2012)
New Revision: 39111
Modified:
trunk/build/aggregate/bottests-site/site/associate.properties
trunk/build/aggregate/site/associate.properties
trunk/build/aggregate/site/sources/associate.properties
trunk/build/aggregate/soa-site/associate.properties
trunk/build/aggregate/webtools-site/associate.properties
trunk/build/parent/pom.xml
trunk/build/target-platform/build.xml
trunk/build/target-platform/jbds.target
trunk/build/target-platform/jbds.target.p2mirror.xml
trunk/build/target-platform/multiple.target
trunk/build/target-platform/multiple.target.p2mirror.xml
trunk/build/target-platform/publish.sh
trunk/build/target-platform/target2p2mirror.xml
trunk/build/target-platform/targetUpdateFromRepo.xml
trunk/build/target-platform/unified.target
trunk/build/target-platform/unified.target.p2mirror.xml
Log:
move trunk to use SR2 composite / TP (JBIDE-10289)
Modified: trunk/build/aggregate/bottests-site/site/associate.properties
===================================================================
--- trunk/build/aggregate/bottests-site/site/associate.properties 2012-02-24 13:47:49 UTC (rev 39110)
+++ trunk/build/aggregate/bottests-site/site/associate.properties 2012-02-24 13:49:09 UTC (rev 39111)
@@ -4,4 +4,4 @@
#update.site.version=3.2.0.M2.2010-07-16_13-26-18-H21
# associate sites to add to the resulting repo
-associate.sites=http://download.jboss.org/jbosstools/updates/indigo/SR1-M/,http://download.jboss.org/jbosstools/updates/development/indigo/,http://dl.google.com/eclipse/plugin/3.7/
+associate.sites=http://download.jboss.org/jbosstools/updates/indigo/SR2/,http://download.jboss.org/jbosstools/updates/development/indigo/,http://dl.google.com/eclipse/plugin/3.7/
Modified: trunk/build/aggregate/site/associate.properties
===================================================================
--- trunk/build/aggregate/site/associate.properties 2012-02-24 13:47:49 UTC (rev 39110)
+++ trunk/build/aggregate/site/associate.properties 2012-02-24 13:49:09 UTC (rev 39111)
@@ -4,4 +4,4 @@
#update.site.version=3.2.0.M2.2010-07-16_13-26-18-H21
# associate sites to add to the resulting repo
-associate.sites=http://download.jboss.org/jbosstools/updates/indigo/SR1-M/,http://dl.google.com/eclipse/plugin/3.7/
+associate.sites=http://download.jboss.org/jbosstools/updates/indigo/SR2/,http://dl.google.com/eclipse/plugin/3.7/
Modified: trunk/build/aggregate/site/sources/associate.properties
===================================================================
--- trunk/build/aggregate/site/sources/associate.properties 2012-02-24 13:47:49 UTC (rev 39110)
+++ trunk/build/aggregate/site/sources/associate.properties 2012-02-24 13:49:09 UTC (rev 39111)
@@ -4,4 +4,4 @@
#update.site.version=3.2.0.M2.2010-07-16_13-26-18-H21
# associate sites to add to the resulting repo
-associate.sites=http://download.jboss.org/jbosstools/updates/indigo/SR1-M/,http://download.jboss.org/jbosstools/updates/development/indigo/,http://dl.google.com/eclipse/plugin/3.7/
+associate.sites=http://download.jboss.org/jbosstools/updates/indigo/SR2/,http://download.jboss.org/jbosstools/updates/development/indigo/,http://dl.google.com/eclipse/plugin/3.7/
Modified: trunk/build/aggregate/soa-site/associate.properties
===================================================================
--- trunk/build/aggregate/soa-site/associate.properties 2012-02-24 13:47:49 UTC (rev 39110)
+++ trunk/build/aggregate/soa-site/associate.properties 2012-02-24 13:49:09 UTC (rev 39111)
@@ -4,4 +4,4 @@
#update.site.version=3.2.0.M2.2010-07-16_13-26-18-H21
# associate sites to add to the resulting repo
-associate.sites=http://download.jboss.org/jbosstools/updates/indigo/SR1-M/,http://download.jboss.org/jbosstools/updates/development/indigo/
+associate.sites=http://download.jboss.org/jbosstools/updates/indigo/SR2/,http://download.jboss.org/jbosstools/updates/development/indigo/
Modified: trunk/build/aggregate/webtools-site/associate.properties
===================================================================
--- trunk/build/aggregate/webtools-site/associate.properties 2012-02-24 13:47:49 UTC (rev 39110)
+++ trunk/build/aggregate/webtools-site/associate.properties 2012-02-24 13:49:09 UTC (rev 39111)
@@ -4,4 +4,4 @@
#update.site.version=3.2.0.M2.2010-07-16_13-26-18-H21
# associate sites to add to the resulting repo
-associate.sites=http://download.jboss.org/jbosstools/updates/indigo/SR1-M/,http://download.jboss.org/jbosstools/updates/development/indigo/
+associate.sites=http://download.jboss.org/jbosstools/updates/indigo/SR2/,http://download.jboss.org/jbosstools/updates/development/indigo/
Modified: trunk/build/parent/pom.xml
===================================================================
--- trunk/build/parent/pom.xml 2012-02-24 13:47:49 UTC (rev 39110)
+++ trunk/build/parent/pom.xml 2012-02-24 13:49:09 UTC (rev 39111)
@@ -33,11 +33,11 @@
</target.platform.classifier.local>
<!-- 1a. URL of latest JBT target platform site -->
- <jbosstools-target-site>http://download.jboss.org/jbosstools/updates/target-platform_3.3.indigo.S...</jbosstools-target-site>
+ <jbosstools-target-site>http://download.jboss.org/jbosstools/updates/target-platform_3.3.indigo.S...</jbosstools-target-site>
<!-- 1b. or use -Plocal.site -Dlocal.site=file:///home/$user/trunk/build/target-platform/REPO/ -->
<!-- TODO: don't forget to update JBDS .updatesite jobs when this value changes! -->
- <local.site>file:///home/hudson/static_build_env/jbds/target-platform_3.3.indigo.SR1-M/e372M-wtp332M.target/</local.site>
+ <local.site>file:///home/hudson/static_build_env/jbds/target-platform_3.3.indigo.SR2/e372M-wtp332M.target/</local.site>
<!-- 2a. URL of latest JBT nightly staging composite site (all the components
in once place) -->
@@ -52,7 +52,7 @@
<!-- 3a. URL of latest JBT requirements composite mirror -->
<!-- TODO: don't forget to update this in ../aggregate/*/associate.properties too (5 files)! -->
- <jboss-requirements-composite-mirror>http://download.jboss.org/jbosstools/updates/indigo/SR1-M/</jboss-requirements-composite-mirror>
+ <jboss-requirements-composite-mirror>http://download.jboss.org/jbosstools/updates/indigo/SR2/</jboss-requirements-composite-mirror>
<!-- 3b., or use -Plocal.requirements -Dlocal.requirements=file:///path/to/mirror/of/composite/requirements/site -->
<local.requirements>file:///qa/services/http/binaries/RHDS/updates/indigo/</local.requirements>
Modified: trunk/build/target-platform/build.xml
===================================================================
--- trunk/build/target-platform/build.xml 2012-02-24 13:47:49 UTC (rev 39110)
+++ trunk/build/target-platform/build.xml 2012-02-24 13:49:09 UTC (rev 39111)
@@ -140,9 +140,12 @@
<!-- NOTE: must use same platform (50M) or SDK (103M - 168M) version as feature version on target platform, or will get install/update conflicts -->
<!-- don't forget to increment these files when moving up a version:
build.xml, *.target*, publish.sh, target2p2mirror.xml -->
+ <!-- also jbds/trunk/releng/org.jboss.ide.eclipse.releng/requirements/jbds-target-platform/build.properties
+ also all devstudio-5.0_*.updatesite jobs (4) need to be pointed at the new Target Platform URL
+ -->
<!-- http://download.eclipse.org/eclipse/downloads/drops/M20120201-1336/downlo... -->
- <property name="eclipse.version" value="M20120201-1336" />
- <property name="eclipse.URL" value="http://www.eclipse.org/downloads/download.php?r=1&file=/eclipse/downl..."/>
+ <property name="eclipse.version" value="3.7.2" />
+ <property name="eclipse.URL" value="http://www.eclipse.org/downloads/download.php?r=1&file=/eclipse/downl..."/>
<if>
<equals arg1="${arch}" arg2="x86" />
Modified: trunk/build/target-platform/jbds.target
===================================================================
--- trunk/build/target-platform/jbds.target 2012-02-24 13:47:49 UTC (rev 39110)
+++ trunk/build/target-platform/jbds.target 2012-02-24 13:49:09 UTC (rev 39111)
@@ -11,9 +11,9 @@
<!-- don't forget to increment these files when moving up a version:
build.xml, *.target*, publish.sh, target2p2mirror.xml -->
- <repository location="http://download.jboss.org/jbosstools/updates/indigo/SR1-M/"/>
- <!-- <repository location="file:///qa/services/http/binaries/RHDS/updates/indigo/SR1-M/"/> -->
- <!-- <repository location="http://www.qa.jboss.com/binaries/RHDS/updates/indigo/SR1-M/"/> -->
+ <repository location="http://download.jboss.org/jbosstools/updates/indigo/SR2/"/>
+ <!-- <repository location="file:///qa/services/http/binaries/RHDS/updates/indigo/SR2/"/> -->
+ <!-- <repository location="http://www.qa.jboss.com/binaries/RHDS/updates/indigo/SR2/"/> -->
<!-- m2e, m2e-wtp + deps -->
<unit id="org.eclipse.m2e.sdk.feature.feature.group" version="1.0.100.20110804-1717"/>
Modified: trunk/build/target-platform/jbds.target.p2mirror.xml
===================================================================
--- trunk/build/target-platform/jbds.target.p2mirror.xml 2012-02-24 13:47:49 UTC (rev 39110)
+++ trunk/build/target-platform/jbds.target.p2mirror.xml 2012-02-24 13:49:09 UTC (rev 39111)
@@ -28,7 +28,7 @@
<p2.mirror destination="file://${repoDir}" verbose="${verbose}">
<slicingOptions includeFeatures="true" followStrict="${followStrict}"/>
<source>
-<repository location="http://download.jboss.org/jbosstools/updates/indigo/SR1-M/"/>
+<repository location="http://download.jboss.org/jbosstools/updates/indigo/SR2/"/>
</source>
<iu id="org.eclipse.m2e.sdk.feature.feature.group" version=""/>
<iu id="org.eclipse.m2e.feature.feature.group" version=""/>
Modified: trunk/build/target-platform/multiple.target
===================================================================
--- trunk/build/target-platform/multiple.target 2012-02-24 13:47:49 UTC (rev 39110)
+++ trunk/build/target-platform/multiple.target 2012-02-24 13:49:09 UTC (rev 39111)
@@ -15,7 +15,7 @@
<location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit">
<!-- don't forget to increment these files when moving up a version:
build.xml, *.target*, publish.sh, target2p2mirror.xml -->
- <repository location="http://download.jboss.org/jbosstools/updates/indigo/SR1-M/"/>
+ <repository location="http://download.jboss.org/jbosstools/updates/indigo/SR2/"/>
<!-- m2e, m2e-wtp + deps -->
<unit id="org.eclipse.m2e.sdk.feature.feature.group" version="1.0.100.20110804-1717"/>
@@ -339,4 +339,4 @@
<feature id="org.mozilla.xpcom.feature"/>
</includeBundles>
<targetJRE path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
-</target>
\ No newline at end of file
+</target>
Modified: trunk/build/target-platform/multiple.target.p2mirror.xml
===================================================================
--- trunk/build/target-platform/multiple.target.p2mirror.xml 2012-02-24 13:47:49 UTC (rev 39110)
+++ trunk/build/target-platform/multiple.target.p2mirror.xml 2012-02-24 13:49:09 UTC (rev 39111)
@@ -29,7 +29,7 @@
<slicingOptions includeFeatures="true" followStrict="${followStrict}"/>
<source>
<repository location="http://download.jboss.org/jbosstools/builds/staging/_composite_/trunk/"/>
-<repository location="http://download.jboss.org/jbosstools/updates/indigo/SR1-M/"/>
+<repository location="http://download.jboss.org/jbosstools/updates/indigo/SR2/"/>
</source>
<iu id="org.eclipse.m2e.sdk.feature.feature.group" version=""/>
<iu id="org.eclipse.m2e.feature.feature.group" version=""/>
Modified: trunk/build/target-platform/publish.sh
===================================================================
--- trunk/build/target-platform/publish.sh 2012-02-24 13:47:49 UTC (rev 39110)
+++ trunk/build/target-platform/publish.sh 2012-02-24 13:49:09 UTC (rev 39111)
@@ -3,11 +3,12 @@
# defaults for JBoss Tools
# don't forget to increment these files when moving up a version:
-# build.xml, *.target*, publish.sh, target2p2mirror.xml; also jbds/trunk/releng/org.jboss.ide.eclipse.releng/requirements/jbds-target-platform/build.properties
+# build.xml, *.target*, publish.sh, target2p2mirror.xml; also jbds/trunk/releng/org.jboss.ide.eclipse.releng/requirements/jbds-target-platform/build.properties;
+# also all devstudio-5.0_*.updatesite jobs (4) need to be pointed at the new Target Platform URL
targetZipFile=e372M-wtp332M.target
-repoDir=/home/hudson/static_build_env/jbds/tools/sources/REPO_3.3.indigo.SR1-M
-destinationPath=/home/hudson/static_build_env/jbds/target-platform_3.3.indigo.SR1-M
-DESTINATION=tools@filemgmt.jboss.org:/downloads_htdocs/tools/updates/target-platform_3.3.indigo.SR1-M
+repoDir=/home/hudson/static_build_env/jbds/tools/sources/REPO_3.3.indigo.SR2
+destinationPath=/home/hudson/static_build_env/jbds/target-platform_3.3.indigo.SR2
+DESTINATION=tools@filemgmt.jboss.org:/downloads_htdocs/tools/updates/target-platform_3.3.indigo.SR2
include="*"
exclude="--exclude '.blobstore'" # exclude the .blobstore
@@ -22,43 +23,25 @@
'-include') include="$2"; shift 2;;
'-exclude') exclude="$2"; shift 2;;
- '-jbt_3.3.indigo.SR1-M')
+ '-jbt_3.3.indigo.SR2')
# defaults for JBT (trunk)
targetZipFile=e372M-wtp332M.target
- repoDir=/home/hudson/static_build_env/jbds/tools/sources/REPO_3.3.indigo.SR1-M
- destinationPath=/home/hudson/static_build_env/jbds/target-platform_3.3.indigo.SR1-M
- DESTINATION=tools@filemgmt.jboss.org:/downloads_htdocs/tools/updates/target-platform_3.3.indigo.SR1-M
+ repoDir=/home/hudson/static_build_env/jbds/tools/sources/REPO_3.3.indigo.SR2
+ destinationPath=/home/hudson/static_build_env/jbds/target-platform_3.3.indigo.SR2
+ DESTINATION=tools@filemgmt.jboss.org:/downloads_htdocs/tools/updates/target-platform_3.3.indigo.SR2
include="*"
exclude="--exclude '.blobstore'" # exclude the .blobstore
shift 1;;
- '-jbt_3.3.indigo')
- # defaults for JBT (stable branch)
- targetZipFile=e371-wtp331.target
- repoDir=/home/hudson/static_build_env/jbds/tools/sources/REPO_3.3.indigo
- destinationPath=/home/hudson/static_build_env/jbds/target-platform_3.3.indigo
- DESTINATION=tools@filemgmt.jboss.org:/downloads_htdocs/tools/updates/target-platform_3.3.indigo
- include="*"
- exclude="--exclude '.blobstore'" # exclude the .blobstore
- shift 1;;
- '-jbds_3.3.indigo.SR1-M')
+ '-jbds_3.3.indigo.SR2')
# defaults for JBDS (trunk)
targetZipFile=jbds500-e372M-wtp332M.target
- repoDir=/home/hudson/static_build_env/jbds/tools/sources/JBDS-REPO_3.3.indigo.SR1-M
- destinationPath=/home/hudson/static_build_env/jbds/jbds-target-platform_3.3.indigo.SR1-M
- DESTINATION=/qa/services/http/binaries/RHDS/updates/jbds-target-platform_3.3.indigo.SR1-M
+ repoDir=/home/hudson/static_build_env/jbds/tools/sources/JBDS-REPO_3.3.indigo.SR2
+ destinationPath=/home/hudson/static_build_env/jbds/jbds-target-platform_3.3.indigo.SR2
+ DESTINATION=/qa/services/http/binaries/RHDS/updates/jbds-target-platform_3.3.indigo.SR2
include=".blobstore *" # include the .blobstore
exclude=""
shift 1;;
- '-jbds_3.3.indigo')
- # defaults for JBDS (stable branch)
- targetZipFile=jbds500-e371-wtp331.target
- repoDir=/home/hudson/static_build_env/jbds/tools/sources/JBDS-REPO_3.3.indigo
- destinationPath=/home/hudson/static_build_env/jbds/jbds-target-platform_3.3.indigo
- DESTINATION=/qa/services/http/binaries/RHDS/updates/jbds-target-platform_3.3.indigo
- include=".blobstore *" # include the .blobstore
- exclude=""
- shift 1;;
esac
done
Modified: trunk/build/target-platform/target2p2mirror.xml
===================================================================
--- trunk/build/target-platform/target2p2mirror.xml 2012-02-24 13:47:49 UTC (rev 39110)
+++ trunk/build/target-platform/target2p2mirror.xml 2012-02-24 13:49:09 UTC (rev 39111)
@@ -1,6 +1,8 @@
<project default="custom.build" name="jbosstools target platform p2.mirror generator">
<!-- don't forget to increment these files when moving up a version:
- build.xml, *.target*, publish.sh, target2p2mirror.xml; also jbds/trunk/releng/org.jboss.ide.eclipse.releng/requirements/jbds-target-platform/build.properties -->
+ build.xml, *.target*, publish.sh, target2p2mirror.xml; also jbds/trunk/releng/org.jboss.ide.eclipse.releng/requirements/jbds-target-platform/build.properties;
+ also all devstudio-5.0_*.updatesite jobs (4) need to be pointed at the new Target Platform URL -->
+
<property name="targetFile" value="e372M-wtp332M.target" />
<!-- if useLatest = true, omit versions from p2.mirror script to fetch latest version available;
Modified: trunk/build/target-platform/targetUpdateFromRepo.xml
===================================================================
--- trunk/build/target-platform/targetUpdateFromRepo.xml 2012-02-24 13:47:49 UTC (rev 39110)
+++ trunk/build/target-platform/targetUpdateFromRepo.xml 2012-02-24 13:49:09 UTC (rev 39111)
@@ -12,7 +12,7 @@
<!-- create a second .target file which replaces all URLs with a single unified (published) one
(eg., for jbosstools target platform site), set these properties too -->
<property name="unified.targetFile" value="unified.target" />
- <property name="unified.URL" value="http://download.jboss.org/jbosstools/updates/target-platform_3.3.indigo.S..." />
+ <property name="unified.URL" value="http://download.jboss.org/jbosstools/updates/target-platform_3.3.indigo.S..." />
<property name="local.targetFile" value="local.target" />
<property name="local.URL" value="file://${repoDir}" />
Modified: trunk/build/target-platform/unified.target
===================================================================
--- trunk/build/target-platform/unified.target 2012-02-24 13:47:49 UTC (rev 39110)
+++ trunk/build/target-platform/unified.target 2012-02-24 13:49:09 UTC (rev 39111)
@@ -9,13 +9,13 @@
<locations>
<location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit">
<!-- for trunk use _composite_/trunk; for 3.3_stable_branch, use _composite_/3.3.indigo -->
- <repository location="http://download.jboss.org/jbosstools/updates/target-platform_3.3.indigo.S..."/>
+ <repository location="http://download.jboss.org/jbosstools/updates/target-platform_3.3.indigo.S..."/>
</location>
<location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit">
<!-- don't forget to increment these files when moving up a version:
build.xml, *.target*, publish.sh, target2p2mirror.xml -->
- <repository location="http://download.jboss.org/jbosstools/updates/target-platform_3.3.indigo.S..."/>
+ <repository location="http://download.jboss.org/jbosstools/updates/target-platform_3.3.indigo.S..."/>
<!-- m2e, m2e-wtp + deps -->
<unit id="org.eclipse.m2e.sdk.feature.feature.group" version="1.0.100.20110804-1717"/>
@@ -339,4 +339,4 @@
<feature id="org.mozilla.xpcom.feature"/>
</includeBundles>
<targetJRE path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
-</target>
\ No newline at end of file
+</target>
Modified: trunk/build/target-platform/unified.target.p2mirror.xml
===================================================================
--- trunk/build/target-platform/unified.target.p2mirror.xml 2012-02-24 13:47:49 UTC (rev 39110)
+++ trunk/build/target-platform/unified.target.p2mirror.xml 2012-02-24 13:49:09 UTC (rev 39111)
@@ -28,8 +28,8 @@
<p2.mirror destination="file://${repoDir}" verbose="${verbose}">
<slicingOptions includeFeatures="true" followStrict="${followStrict}"/>
<source>
-<repository location="http://download.jboss.org/jbosstools/updates/target-platform_3.3.indigo.S..."/>
-<repository location="http://download.jboss.org/jbosstools/updates/target-platform_3.3.indigo.S..."/>
+<repository location="http://download.jboss.org/jbosstools/updates/target-platform_3.3.indigo.S..."/>
+<repository location="http://download.jboss.org/jbosstools/updates/target-platform_3.3.indigo.S..."/>
</source>
<iu id="org.eclipse.m2e.sdk.feature.feature.group" version=""/>
<iu id="org.eclipse.m2e.feature.feature.group" version=""/>
12 years, 4 months
- 1
- 0