JBoss Tools SVN: r24932 - trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2010-09-15 08:12:42 -0400 (Wed, 15 Sep 2010)
New Revision: 24932
Modified:
trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/SeamProject.java
Log:
https://jira.jboss.org/browse/JBIDE-7066
Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/SeamProject.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/SeamProject.java 2010-09-15 11:56:52 UTC (rev 24931)
+++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/SeamProject.java 2010-09-15 12:12:42 UTC (rev 24932)
@@ -428,6 +428,7 @@
for (int i = 0; i < ps.length; i++) {
pathRemoved(ps[i]);
}
+ dependsOn.clear();
packages.clear();
createScopes();
fireChanges();
15 years, 7 months
- 1
- 0
JBoss Tools SVN: r24931 - trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2010-09-15 07:56:52 -0400 (Wed, 15 Sep 2010)
New Revision: 24931
Modified:
trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/SeamEARTest.java
Log:
https://jira.jboss.org/browse/JBIDE-7066
Modified: trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/SeamEARTest.java
===================================================================
--- trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/SeamEARTest.java 2010-09-15 11:08:15 UTC (rev 24930)
+++ trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/SeamEARTest.java 2010-09-15 11:56:52 UTC (rev 24931)
@@ -83,6 +83,32 @@
assertNotNull("War project must see component 'authenticator' declared in ejb project", c);
}
+
+ public void testCleanEarProject() throws CoreException {
+ ISeamProject seamProject = getSeamProject(projectWAR);
+ ISeamComponent c = seamProject.getComponent("authenticator");
+
+ assertNotNull("War project must see component 'authenticator' declared in ejb project", c);
+
+ boolean saveAutoBuild = ResourcesUtils.setBuildAutomatically(false);
+
+ JobUtils.waitForIdle();
+
+ projectWAR.build(IncrementalProjectBuilder.CLEAN_BUILD, new NullProgressMonitor());
+ JobUtils.waitForIdle();
+
+ c = seamProject.getComponent("authenticator");
+ assertNull("War project must see component 'authenticator' declared in ejb project", c);
+
+ projectWAR.build(IncrementalProjectBuilder.FULL_BUILD, new NullProgressMonitor());
+ JobUtils.waitForIdle();
+ c = seamProject.getComponent("authenticator");
+ assertNotNull("War project must see component 'authenticator' declared in ejb project", c);
+
+ ResourcesUtils.setBuildAutomatically(saveAutoBuild);
+
+ }
+
protected void tearDown() throws Exception {
setup.deleteProjects();
15 years, 7 months
- 1
- 0
JBoss Tools SVN: r24930 - trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console.
by jbosstools-commits＠lists.jboss.org
Author: dgeraskov
Date: 2010-09-15 07:08:15 -0400 (Wed, 15 Sep 2010)
New Revision: 24930
Modified:
trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/EclipseLaunchConsoleConfigurationPreferences.java
Log:
https://jira.jboss.org/browse/JBIDE-6988
Console Configuration should take into account schema and catalog specified for jpa project
Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/EclipseLaunchConsoleConfigurationPreferences.java
===================================================================
--- trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/EclipseLaunchConsoleConfigurationPreferences.java 2010-09-15 09:54:41 UTC (rev 24929)
+++ trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/EclipseLaunchConsoleConfigurationPreferences.java 2010-09-15 11:08:15 UTC (rev 24930)
@@ -139,7 +139,7 @@
public String getConnectionProfileName() {
if (Boolean.parseBoolean(getAttribute(IConsoleConfigurationLaunchConstants.USE_JPA_PROJECT_PROFILE, null))){
- String projName = getAttribute(IJavaLaunchConfigurationConstants.ATTR_PROJECT_NAME, null);
+ String projName = getProjectName();
if (projName != null){
IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(projName);
if (project != null){
@@ -161,12 +161,12 @@
public Properties getProperties() {
File propFile = getPropertyFile();
- if(propFile==null) return null;
- Properties p = new Properties();
+ if(propFile==null) return getProjectOverrides();
+ Properties fileProp = new Properties();
FileInputStream fis = null;
try {
fis = new FileInputStream(propFile);
- p.load(fis);
+ fileProp.load(fis);
}
catch(IOException io) {
throw new HibernateConsoleRuntimeException(NLS.bind(HibernateConsoleMessages.EclipseLaunchConsoleConfigurationPreferences_could_not_load_property_file, propFile), io);
@@ -180,7 +180,13 @@
}
}
}
- return p;
+ //which properties are main?
+ Properties p = getProjectOverrides();
+ if (p != null){
+ p.putAll(fileProp);
+ return p;
+ }
+ return fileProp;
}
public File getPropertyFile() {
@@ -210,5 +216,31 @@
}
return dialect;
}
+
+ public String getProjectName(){
+ return getAttribute(IJavaLaunchConfigurationConstants.ATTR_PROJECT_NAME, null);
+
+ }
+
+ public Properties getProjectOverrides(){
+ Properties prop = new Properties();
+ String projName = getProjectName();
+ if (projName != null){
+ IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(projName);
+ if (project != null){
+ JpaProject jpaProject = (JpaProject) project.getAdapter(JpaProject.class);
+ if (jpaProject != null) {
+ if (jpaProject.getUserOverrideDefaultCatalog() != null){
+ prop.put("hibernate.default_catalog", jpaProject.getUserOverrideDefaultCatalog());
+ }
+ if (jpaProject.getUserOverrideDefaultSchema() != null){
+ prop.put("hibernate.default_schema", jpaProject.getUserOverrideDefaultSchema());
+ }
+
+ }
+ }
+ }
+ return prop.size() == 0 ? null : prop;
+ }
}
15 years, 7 months
- 1
- 0
JBoss Tools SVN: r24929 - in trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test: jbide and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: yradtsevich
Date: 2010-09-15 05:54:41 -0400 (Wed, 15 Sep 2010)
New Revision: 24929
Modified:
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/JsfAllTests.java
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/DnD_JBIDE5042_JBIDE6229_Test.java
Log:
https://jira.jboss.org/browse/JBIDE-6439 :
Refactor and partially reimpement VpeDnD class
- jMock tests for D&D are excluded from JsfAllTests.
Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/JsfAllTests.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/JsfAllTests.java 2010-09-15 09:44:40 UTC (rev 24928)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/JsfAllTests.java 2010-09-15 09:54:41 UTC (rev 24929)
@@ -137,7 +137,7 @@
*/
suite.addTestSuite(JSF2ValidatorTest.class);
suite.addTestSuite(DocBookTemplatesTest.class);
- suite.addTestSuite(DnD_JBIDE5042_JBIDE6229_Test.class);
+// suite.addTestSuite(DnD_JBIDE5042_JBIDE6229_Test.class);
suite.addTestSuite(UnclosedELExpressionTest.class);
suite.addTestSuite(TestContextPathResolution.class);
suite.addTestSuite(JBIDE5920Test.class);
Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/DnD_JBIDE5042_JBIDE6229_Test.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/DnD_JBIDE5042_JBIDE6229_Test.java 2010-09-15 09:44:40 UTC (rev 24928)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/DnD_JBIDE5042_JBIDE6229_Test.java 2010-09-15 09:54:41 UTC (rev 24929)
@@ -44,7 +44,6 @@
import org.mozilla.interfaces.nsIScriptableRegion;
import org.mozilla.interfaces.nsISupportsArray;
import org.w3c.dom.Element;
-import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
import org.w3c.dom.Text;
@@ -53,7 +52,12 @@
*
* @see JIRA Issue JBIDE-5042 ( https://jira.jboss.org/jira/browse/JBIDE-5042 ):
* "Enhance DnD support in VPE"
+ * @see JIRA Issue JBIDE-6439 ( https://jira.jboss.org/jira/browse/JBIDE-6439 ):
+ * "Refactor and partially reimpement VpeDnD class"
*
+ * @deprecated This test is obsolete. These jMock tests for D&D require too
+ * many efforts and changes in non-test plug-ins to be in actual state.
+ *
* @author yradtsevich
*/
@SuppressWarnings("nls")
15 years, 7 months
- 1
- 0
JBoss Tools SVN: r24928 - in trunk/usage: plugins/org.jboss.tools.usage/src/org/jboss/tools/usage and 5 other directories.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2010-09-15 05:44:40 -0400 (Wed, 15 Sep 2010)
New Revision: 24928
Added:
trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/JBossToolsFocusPoint.java
trunk/usage/tests/org.jboss.tools.usage.test/JBossToolsFocusPointTest.launch
trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/JBossToolsFocusPointTest.java
Modified:
trunk/usage/plugins/org.jboss.tools.usage/build.properties
trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/FocusPoint.java
trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/Tracker.java
trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/googleanalytics/GoogleAnalyticsUrlStrategy.java
trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/reporting/UsageReport.java
trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/util/HttpEncodingUtils.java
trunk/usage/tests/org.jboss.tools.usage.test/FocusPointTest.launch
trunk/usage/tests/org.jboss.tools.usage.test/build.properties
trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/FocusPointTest.java
trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/JBossToolsTestsFocusPoint.java
trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/JBossToolsUsageIntegrationTest.java
trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/UsageTestSuite.java
Log:
[JBIDE-7041] implemented and tested, cleaned the warnings (build.properties, etc.)
Modified: trunk/usage/plugins/org.jboss.tools.usage/build.properties
===================================================================
--- trunk/usage/plugins/org.jboss.tools.usage/build.properties 2010-09-15 07:08:37 UTC (rev 24927)
+++ trunk/usage/plugins/org.jboss.tools.usage/build.properties 2010-09-15 09:44:40 UTC (rev 24928)
@@ -1,7 +1,6 @@
source.. = src/
output.. = bin/
bin.includes = .,\
- plugin.properties.bak,\
OSGI-INF/l10n/bundle.properties,\
.classpath,\
.project,\
@@ -13,16 +12,7 @@
plugin.xml,\
pom.xml,\
src/
-src.includes = .classpath,\
- .project,\
- .settings/,\
- JBoss Usage Reporter.launch,\
- META-INF/,\
+src.includes = JBoss Usage Reporter.launch,\
about.html,\
- build.properties,\
- plugin.xml,\
- src/,\
- plugin.properties.bak,\
- pom.xml,\
- plugin.properties,\
- OSGI-INF/
+ pom.xml
+
Modified: trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/FocusPoint.java
===================================================================
--- trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/FocusPoint.java 2010-09-15 07:08:37 UTC (rev 24927)
+++ trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/FocusPoint.java 2010-09-15 09:44:40 UTC (rev 24928)
@@ -45,13 +45,13 @@
return childFocusPoint;
}
- public String getContentURI() {
+ public String getURI() {
StringBuilder builder = new StringBuilder();
appendContentURI(builder, this);
return HttpEncodingUtils.checkedEncodeUtf8(builder.toString());
}
- private void appendContentURI(StringBuilder builder, FocusPoint focusPoint) {
+ protected void appendContentURI(StringBuilder builder, FocusPoint focusPoint) {
FocusPoint parentFocuPoint = focusPoint.getChild();
builder.append(URI_SEPARATOR);
builder.append(focusPoint.getName());
@@ -60,13 +60,13 @@
}
}
- public String getContentTitle() {
+ public String getTitle() {
StringBuilder builder = new StringBuilder();
appendContentTitle(builder, this);
return HttpEncodingUtils.checkedEncodeUtf8(builder.toString());
}
- private void appendContentTitle(StringBuilder builder, FocusPoint focusPoint) {
+ protected void appendContentTitle(StringBuilder builder, FocusPoint focusPoint) {
FocusPoint childFocusPoint = focusPoint.getChild();
builder.append(focusPoint.getName());
if (childFocusPoint != null) {
Added: trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/JBossToolsFocusPoint.java
===================================================================
--- trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/JBossToolsFocusPoint.java (rev 0)
+++ trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/JBossToolsFocusPoint.java 2010-09-15 09:44:40 UTC (rev 24928)
@@ -0,0 +1,50 @@
+/*******************************************************************************
+ * Copyright (c) 2010 Red Hat, Inc.
+ * Distributed under license by Red Hat, Inc. All rights reserved.
+ * This program is made available under the terms of the
+ * Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
+package org.jboss.tools.usage;
+
+import org.jboss.tools.usage.internal.JBossToolsUsageActivator;
+import org.jboss.tools.usage.util.HttpEncodingUtils;
+
+/**
+ * A focus point that always reports the current jboss tools version as last
+ * component.
+ */
+public class JBossToolsFocusPoint extends FocusPoint {
+
+ public JBossToolsFocusPoint(String name) {
+ super(name);
+ }
+
+ @Override
+ public String getURI() {
+ StringBuilder builder = new StringBuilder();
+ appendContentURI(builder, this);
+ appendJBossToolsVersion(builder, URI_SEPARATOR);
+ return HttpEncodingUtils.checkedEncodeUtf8(builder.toString());
+ }
+
+ protected void appendJBossToolsVersion(StringBuilder builder, String separator) {
+ builder.append(separator);
+ builder.append(getJBossToolsVersion());
+ }
+
+ @Override
+ public String getTitle() {
+ StringBuilder builder = new StringBuilder();
+ appendContentTitle(builder, this);
+ appendJBossToolsVersion(builder, TITLE_SEPARATOR);
+ return HttpEncodingUtils.checkedEncodeUtf8(builder.toString());
+ }
+
+ protected String getJBossToolsVersion() {
+ return JBossToolsUsageActivator.getDefault().getBundle().getVersion().toString();
+ }
+}
Property changes on: trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/JBossToolsFocusPoint.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Modified: trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/Tracker.java
===================================================================
--- trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/Tracker.java 2010-09-15 07:08:37 UTC (rev 24927)
+++ trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/Tracker.java 2010-09-15 09:44:40 UTC (rev 24928)
@@ -37,7 +37,7 @@
public void trackSynchronously(FocusPoint focusPoint) {
loggingAdapter
- .logMessage(MessageFormat.format(UsageMessages.Tracker_Synchronous, focusPoint.getContentTitle()));
+ .logMessage(MessageFormat.format(UsageMessages.Tracker_Synchronous, focusPoint.getTitle()));
try {
httpRequest.request(getTrackingUrl(focusPoint));
} catch (Exception e) {
@@ -51,7 +51,7 @@
public void trackAsynchronously(FocusPoint focusPoint) {
loggingAdapter.logMessage(MessageFormat
- .format(UsageMessages.Tracker_Asynchronous, focusPoint.getContentTitle()));
+ .format(UsageMessages.Tracker_Asynchronous, focusPoint.getTitle()));
new Thread(new TrackingRunnable(focusPoint)).start();
}
Modified: trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/googleanalytics/GoogleAnalyticsUrlStrategy.java
===================================================================
--- trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/googleanalytics/GoogleAnalyticsUrlStrategy.java 2010-09-15 07:08:37 UTC (rev 24927)
+++ trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/googleanalytics/GoogleAnalyticsUrlStrategy.java 2010-09-15 09:44:40 UTC (rev 24928)
@@ -109,12 +109,12 @@
builder);
appendParameter(IGoogleAnalyticsParameters.PARAM_BROWSER_LANGUAGE, googleParameters.getBrowserLanguage(),
builder);
- appendParameter(IGoogleAnalyticsParameters.PARAM_PAGE_TITLE, focusPoint.getContentTitle(), builder);
+ appendParameter(IGoogleAnalyticsParameters.PARAM_PAGE_TITLE, focusPoint.getTitle(), builder);
// appendParameter(IGoogleAnalyticsParameters.PARAM_HID,
// getRandomNumber(), builder);
appendParameter(IGoogleAnalyticsParameters.PARAM_FLASH_VERSION, googleParameters.getFlashVersion(), builder);
appendParameter(IGoogleAnalyticsParameters.PARAM_REFERRAL, googleParameters.getReferral(), builder);
- appendParameter(IGoogleAnalyticsParameters.PARAM_PAGE_REQUEST, focusPoint.getContentURI(), builder);
+ appendParameter(IGoogleAnalyticsParameters.PARAM_PAGE_REQUEST, focusPoint.getURI(), builder);
appendParameter(IGoogleAnalyticsParameters.PARAM_ACCOUNT_NAME, googleParameters.getAccountName(), builder);
appendParameter(IGoogleAnalyticsParameters.PARAM_COOKIES, getCookies(), builder);
Modified: trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/reporting/UsageReport.java
===================================================================
--- trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/reporting/UsageReport.java 2010-09-15 07:08:37 UTC (rev 24927)
+++ trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/reporting/UsageReport.java 2010-09-15 09:44:40 UTC (rev 24928)
@@ -23,6 +23,7 @@
import org.jboss.tools.usage.ILoggingAdapter;
import org.jboss.tools.usage.ITracker;
import org.jboss.tools.usage.IURLBuildingStrategy;
+import org.jboss.tools.usage.JBossToolsFocusPoint;
import org.jboss.tools.usage.PluginLogger;
import org.jboss.tools.usage.Tracker;
import org.jboss.tools.usage.googleanalytics.GoogleAnalyticsUrlStrategy;
@@ -44,7 +45,7 @@
private static final String HOST_NAME = ReportingMessages.UsageReport_HostName;
- private FocusPoint focusPoint = new FocusPoint("tools") //$NON-NLS-1$
+ private FocusPoint focusPoint = new JBossToolsFocusPoint("tools") //$NON-NLS-1$
.setChild(new FocusPoint("usage") //$NON-NLS-1$
.setChild(new FocusPoint("action") //$NON-NLS-1$
.setChild(new FocusPoint("wsstartup")))); //$NON-NLS-1$
Modified: trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/util/HttpEncodingUtils.java
===================================================================
--- trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/util/HttpEncodingUtils.java 2010-09-15 07:08:37 UTC (rev 24927)
+++ trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/util/HttpEncodingUtils.java 2010-09-15 09:44:40 UTC (rev 24928)
@@ -33,11 +33,11 @@
* @return the encoded string or <tt>null</tt> if an error occured while
* encoding
*/
- public static String checkedEncodeUtf8(String aString) {
+ public static String checkedEncodeUtf8(String string) {
try {
- return URLEncoder.encode(aString, ENCODING_UTF8);
+ return URLEncoder.encode(string, ENCODING_UTF8);
} catch (UnsupportedEncodingException e) {
- return aString;
+ return string;
}
}
Modified: trunk/usage/tests/org.jboss.tools.usage.test/FocusPointTest.launch
===================================================================
--- trunk/usage/tests/org.jboss.tools.usage.test/FocusPointTest.launch 2010-09-15 07:08:37 UTC (rev 24927)
+++ trunk/usage/tests/org.jboss.tools.usage.test/FocusPointTest.launch 2010-09-15 09:44:40 UTC (rev 24928)
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<launchConfiguration type="org.eclipse.pde.ui.JunitLaunchConfig">
<booleanAttribute key="append.args" value="true"/>
<stringAttribute key="application" value="org.eclipse.pde.junit.runtime.coretestapplication"/>
@@ -21,14 +21,14 @@
<listEntry value="1"/>
</listAttribute>
<listAttribute key="org.eclipse.debug.ui.favoriteGroups">
+<listEntry value="org.eclipse.debug.ui.launchGroup.run"/>
<listEntry value="org.eclipse.debug.ui.launchGroup.debug"/>
-<listEntry value="org.eclipse.debug.ui.launchGroup.run"/>
</listAttribute>
<stringAttribute key="org.eclipse.jdt.junit.CONTAINER" value=""/>
<booleanAttribute key="org.eclipse.jdt.junit.KEEPRUNNING_ATTR" value="false"/>
<stringAttribute key="org.eclipse.jdt.junit.TESTNAME" value=""/>
<stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit4"/>
-<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.launching.macosx.MacOSXType/JVM 1.5"/>
+<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.jboss.tools.usage.test.FocusPointTest"/>
<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl}"/>
<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.jboss.tools.usage.test"/>
@@ -36,10 +36,11 @@
<stringAttribute key="pde.version" value="3.3"/>
<stringAttribute key="product" value="com.jboss.jbds.product.product"/>
<booleanAttribute key="run_in_ui_thread" value="false"/>
-<stringAttribute key="selected_target_plugins" value="org.eclipse.help@default:default,org.eclipse.ecf.provider.filetransfer.ssl@default:false,org.eclipse.core.resources@default:default,org.eclipse.ui.ide@default:default,org.jboss.tools.xulrunner.initializer@default:false,org.eclipse.ui.views@default:default,org.eclipse.core.expressions@default:default,org.eclipse.swt@default:default,org.eclipse.osgi.services@default:default,org.eclipse.core.filesystem.macosx@default:false,org.eclipse.equinox.preferences@default:default,org.junit4@default:default,javax.servlet@default:default,org.eclipse.equinox.security@default:default,org.eclipse.ecf.provider.filetransfer@default:default,org.eclipse.ecf.filetransfer@default:default,org.eclipse.core.databinding@default:default,org.hamcrest.core@default:default,org.eclipse.jface@default:default,org.eclipse.equinox.transforms.hook@default:false,org.eclipse.equinox.p2.metadata.repository@default:default,org.eclipse.ecf.identity@default:defaul!
t,org.eclipse.equinox.p2.repository@default:default,org.eclipse.core.databinding.property@default:default,org.eclipse.core.net@default:default,org.eclipse.equinox.registry@default:default,org.eclipse.equinox.common@2:true,org.eclipse.equinox.security.macosx@default:false,org.eclipse.ant.core@default:default,org.eclipse.ui.forms@default:default,org.eclipse.core.databinding.observable@default:default,org.eclipse.ecf@default:default,org.eclipse.equinox.concurrent@default:default,org.eclipse.core.variables@default:default,org.eclipse.core.resources.compatibility@default:false,org.eclipse.equinox.p2.artifact.repository@default:default,org.eclipse.core.contenttype@default:default,org.eclipse.text@default:default,org.eclipse.core.commands@default:default,org.eclipse.equinox.p2.core@default:default,org.eclipse.core.filesystem@default:default,javax.transaction@default:false,org.eclipse.ecf.ssl@default:false,com.ibm.icu@default:default,org.eclipse.ui@default:default,org.eclipse.ui.co!
coa@default:false,org.eclipse.equinox.app@default:default,org.!
eclipse.
jface.databinding@default:default,org.eclipse.equinox.p2.metadata@default:default,org.eclipse.osgi@-1:true,org.eclipse.swt.cocoa.macosx@default:false,org.eclipse.core.runtime.compatibility.auth@default:default,org.eclipse.equinox.p2.engine@default:default,org.eclipse.ui.workbench@default:default,org.eclipse.core.runtime@default:true,org.eclipse.core.jobs@default:default,org.eclipse.core.runtime.compatibility.registry@default:false,org.eclipse.equinox.p2.jarprocessor@default:default,org.eclipse.jface.text@default:default"/>
-<stringAttribute key="selected_workspace_plugins" value="org.jboss.tools.usage@default:default,org.jboss.tools.usage.test@default:default"/>
+<stringAttribute key="selected_target_plugins" value="org.junit4@default:default,org.eclipse.core.expressions@default:default,org.eclipse.ecf.provider.filetransfer.ssl@default:false,org.eclipse.ecf.provider.filetransfer@default:default,org.eclipse.core.contenttype@default:default,org.eclipse.core.runtime.compatibility.registry@default:false,org.eclipse.core.net@default:default,org.eclipse.equinox.p2.artifact.repository@default:default,org.eclipse.swt@default:default,org.eclipse.equinox.p2.repository@default:default,org.eclipse.equinox.p2.engine@default:default,org.eclipse.ecf.ssl@default:false,org.eclipse.ant.core@default:default,org.eclipse.ui.views@default:default,org.eclipse.text@default:default,org.eclipse.core.filesystem@default:default,org.eclipse.ui.cocoa@default:false,org.eclipse.equinox.common@2:true,org.eclipse.core.runtime@default:true,org.eclipse.equinox.p2.core@default:default,org.eclipse.ecf@default:default,org.eclipse.ui.workbench@default:default,org.eclipse.!
equinox.p2.metadata@default:default,javax.servlet@default:default,org.eclipse.core.jobs@default:default,org.eclipse.equinox.app@default:default,org.hamcrest.core@default:default,org.eclipse.equinox.preferences@default:default,org.eclipse.core.runtime.compatibility.auth@default:default,org.eclipse.core.databinding.observable@default:default,org.eclipse.core.databinding.property@default:default,org.eclipse.core.resources@default:default,org.eclipse.jface.databinding@default:default,org.eclipse.ecf.identity@default:default,org.eclipse.help@default:default,org.eclipse.equinox.security@default:default,org.eclipse.equinox.registry@default:default,org.eclipse.equinox.p2.jarprocessor@default:default,org.eclipse.ui.forms@default:default,com.ibm.icu@default:default,org.eclipse.equinox.p2.metadata.repository@default:default,org.eclipse.osgi.services@default:default,org.eclipse.equinox.security.macosx@default:false,org.eclipse.ecf.filetransfer@default:default,org.eclipse.core.filesyste!
m.macosx@default:false,org.eclipse.core.variables@default:defa!
ult,org.
eclipse.osgi@-1:true,org.eclipse.core.databinding@default:default,org.eclipse.jface@default:default,org.eclipse.jface.text@default:default,org.eclipse.equinox.concurrent@default:default,org.eclipse.core.commands@default:default,org.eclipse.ui.ide@default:default,org.eclipse.ui@default:default"/>
+<stringAttribute key="selected_workspace_plugins" value="org.jboss.tools.gwt.core@default:default,org.jboss.tools.xulrunner.initializer@default:false,org.jboss.tools.gwt.ui@default:default,org.jboss.tools.usage.test@default:default,org.jboss.tools.common@default:default,org.jboss.tools.usage@default:default"/>
<booleanAttribute key="show_selected_only" value="false"/>
<booleanAttribute key="tracing" value="false"/>
+<booleanAttribute key="useCustomFeatures" value="false"/>
<booleanAttribute key="useDefaultConfig" value="true"/>
<booleanAttribute key="useDefaultConfigArea" value="true"/>
<booleanAttribute key="useProduct" value="false"/>
Added: trunk/usage/tests/org.jboss.tools.usage.test/JBossToolsFocusPointTest.launch
===================================================================
--- trunk/usage/tests/org.jboss.tools.usage.test/JBossToolsFocusPointTest.launch (rev 0)
+++ trunk/usage/tests/org.jboss.tools.usage.test/JBossToolsFocusPointTest.launch 2010-09-15 09:44:40 UTC (rev 24928)
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<launchConfiguration type="org.eclipse.pde.ui.JunitLaunchConfig">
+<booleanAttribute key="append.args" value="true"/>
+<stringAttribute key="application" value="org.eclipse.pde.junit.runtime.coretestapplication"/>
+<booleanAttribute key="askclear" value="false"/>
+<booleanAttribute key="automaticAdd" value="true"/>
+<booleanAttribute key="automaticValidate" value="false"/>
+<stringAttribute key="bootstrap" value=""/>
+<stringAttribute key="checked" value="[NONE]"/>
+<booleanAttribute key="clearConfig" value="true"/>
+<booleanAttribute key="clearws" value="true"/>
+<booleanAttribute key="clearwslog" value="false"/>
+<stringAttribute key="configLocation" value="${workspace_loc}/.metadata/.plugins/org.eclipse.pde.core/pde-junit"/>
+<booleanAttribute key="default" value="false"/>
+<stringAttribute key="deselected_workspace_plugins" value="org.jboss.tools.gwt.core,org.jboss.tools.gwt.ui,org.jboss.tools.common"/>
+<booleanAttribute key="includeOptional" value="true"/>
+<stringAttribute key="location" value="${workspace_loc}/../junit-workspace"/>
+<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
+<listEntry value="/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/JBossToolsFocusPointTest.java"/>
+</listAttribute>
+<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
+<listEntry value="1"/>
+</listAttribute>
+<listAttribute key="org.eclipse.debug.ui.favoriteGroups">
+<listEntry value="org.eclipse.debug.ui.launchGroup.run"/>
+<listEntry value="org.eclipse.debug.ui.launchGroup.debug"/>
+</listAttribute>
+<stringAttribute key="org.eclipse.jdt.junit.CONTAINER" value=""/>
+<booleanAttribute key="org.eclipse.jdt.junit.KEEPRUNNING_ATTR" value="false"/>
+<stringAttribute key="org.eclipse.jdt.junit.TESTNAME" value=""/>
+<stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit4"/>
+<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.jboss.tools.usage.test.JBossToolsFocusPointTest"/>
+<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -consoleLog"/>
+<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.jboss.tools.usage.test"/>
+<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>
+<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Dosgi.requiredJavaVersion=1.5 -XstartOnFirstThread -Dorg.eclipse.swt.internal.carbon.smallFonts -XX:MaxPermSize=256m -Xdock:icon=../Resources/Eclipse.icns -XstartOnFirstThread -Dorg.eclipse.swt.internal.carbon.smallFonts -Xdock:icon=../Resources/Eclipse.icns -XstartOnFirstThread -Dorg.eclipse.swt.internal.carbon.smallFonts -Xms40m -Xmx512m -Xdock:icon=../Resources/Eclipse.icns -XstartOnFirstThread -Dorg.eclipse.swt.internal.carbon.smallFonts"/>
+<stringAttribute key="pde.version" value="3.3"/>
+<stringAttribute key="product" value="org.eclipse.sdk.ide"/>
+<booleanAttribute key="run_in_ui_thread" value="true"/>
+<stringAttribute key="selected_target_plugins" value="org.junit4@default:default,org.eclipse.core.expressions@default:default,org.junit*4.8.1.v4_8_1_v20100427-1100@default:default,org.eclipse.core.contenttype@default:default,org.eclipse.core.runtime.compatibility.registry@default:false,org.eclipse.swt@default:default,org.eclipse.ui.cocoa@default:false,org.eclipse.equinox.common@2:true,org.eclipse.core.runtime@default:true,org.eclipse.ui.workbench@default:default,javax.servlet@default:default,org.eclipse.core.jobs@default:default,org.eclipse.equinox.app@default:default,org.hamcrest.core@default:default,org.eclipse.equinox.preferences@default:default,org.eclipse.core.runtime.compatibility.auth@default:default,org.eclipse.core.databinding.observable@default:default,org.eclipse.core.databinding.property@default:default,org.eclipse.jface.databinding@default:default,org.eclipse.help@default:default,org.eclipse.equinox.registry@default:default,com.ibm.icu@default:default,org.eclip!
se.osgi.services@default:default,org.eclipse.swt.cocoa.macosx.x86_64@default:false,org.eclipse.osgi@-1:true,org.eclipse.core.databinding@default:default,org.eclipse.jface@default:default,org.eclipse.core.commands@default:default,org.eclipse.ui@default:default"/>
+<stringAttribute key="selected_workspace_plugins" value="org.jboss.tools.xulrunner.initializer@default:false,org.jboss.tools.usage.test@default:default,org.jboss.tools.usage@default:default"/>
+<booleanAttribute key="show_selected_only" value="false"/>
+<booleanAttribute key="tracing" value="false"/>
+<booleanAttribute key="useCustomFeatures" value="false"/>
+<booleanAttribute key="useDefaultConfig" value="true"/>
+<booleanAttribute key="useDefaultConfigArea" value="false"/>
+<booleanAttribute key="useProduct" value="false"/>
+</launchConfiguration>
Property changes on: trunk/usage/tests/org.jboss.tools.usage.test/JBossToolsFocusPointTest.launch
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Modified: trunk/usage/tests/org.jboss.tools.usage.test/build.properties
===================================================================
--- trunk/usage/tests/org.jboss.tools.usage.test/build.properties 2010-09-15 07:08:37 UTC (rev 24927)
+++ trunk/usage/tests/org.jboss.tools.usage.test/build.properties 2010-09-15 09:44:40 UTC (rev 24928)
@@ -5,22 +5,15 @@
about.html,\
bin/,\
OSGI-INF/l10n/bundle.properties
-src.includes = .settings/,\
- .project,\
- .classpath,\
- EclipseEnvironmentTest.launch,\
+src.includes = EclipseEnvironmentTest.launch,\
FocusPointTest.launch,\
GoogleAnalyticsUrlStrategyTest.launch,\
- JBossToolsUsageTest.launch,\
JBossToolsUsageRequestsTest.launch,\
- META-INF/,\
about.html,\
- build.properties,\
src/,\
GlobalUsageReportingSettingsTest.launch,\
JBossToolsUsageIntegrationTest.launch,\
UsageTestSuite.launch,\
pom.xml,\
JBossToolsComponentsTest.launch,\
- ReportingEclipseEnvironmentTest.launch,\
- OSGI-INF/
+ ReportingEclipseEnvironmentTest.launch
Modified: trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/FocusPointTest.java
===================================================================
--- trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/FocusPointTest.java 2010-09-15 07:08:37 UTC (rev 24927)
+++ trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/FocusPointTest.java 2010-09-15 09:44:40 UTC (rev 24928)
@@ -10,49 +10,55 @@
******************************************************************************/
package org.jboss.tools.usage.test;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+
import org.jboss.tools.usage.FocusPoint;
import org.jboss.tools.usage.util.HttpEncodingUtils;
+import org.junit.Test;
-import junit.framework.TestCase;
-
/**
* @author Andre Dietisheim
*/
-public class FocusPointTest extends TestCase {
+public class FocusPointTest {
- private static final String root = "root";
+ private static final String ROOT = "root";
- private static final String child1 = "child1";
+ private static final String CHILD1 = "child1";
private static final String URI_SEPARATOR_ENCODED = HttpEncodingUtils.checkedEncodeUtf8(FocusPoint.URI_SEPARATOR);
private static final String TITLE_SEPARATOR_ENCODED = HttpEncodingUtils.checkedEncodeUtf8(FocusPoint.TITLE_SEPARATOR);
+ @Test
public void testGetContentURI_Simple() throws Exception {
- FocusPoint focusPoint = new FocusPoint(root);
- String contentURI = focusPoint.getContentURI();
+ FocusPoint focusPoint = new FocusPoint(ROOT);
+ String contentURI = focusPoint.getURI();
assertNotNull(contentURI);
- assertEquals(URI_SEPARATOR_ENCODED + root, contentURI);
+ assertEquals(URI_SEPARATOR_ENCODED + ROOT, contentURI);
}
+ @Test
public void testGetContentURI_OneLevel() throws Exception {
- FocusPoint focusPoint = new FocusPoint(root).setChild(new FocusPoint(child1));
- String contentURI = focusPoint.getContentURI();
+ FocusPoint focusPoint = new FocusPoint(ROOT).setChild(new FocusPoint(CHILD1));
+ String contentURI = focusPoint.getURI();
assertNotNull(contentURI);
- assertEquals(URI_SEPARATOR_ENCODED + root + URI_SEPARATOR_ENCODED + child1, contentURI);
+ assertEquals(URI_SEPARATOR_ENCODED + ROOT + URI_SEPARATOR_ENCODED + CHILD1, contentURI);
}
+ @Test
public void testGetContentTitle_Simple() throws Exception {
- FocusPoint focusPoint = new FocusPoint(root);
- String contentTitle = focusPoint.getContentTitle();
+ FocusPoint focusPoint = new FocusPoint(ROOT);
+ String contentTitle = focusPoint.getTitle();
assertNotNull(contentTitle);
- assertEquals(root, contentTitle);
+ assertEquals(ROOT, contentTitle);
}
+ @Test
public void testGetContentTitle_OneLevel() throws Exception {
- FocusPoint focusPoint = new FocusPoint(root).setChild(new FocusPoint(child1));
- String contentTitle = focusPoint.getContentTitle();
+ FocusPoint focusPoint = new FocusPoint(ROOT).setChild(new FocusPoint(CHILD1));
+ String contentTitle = focusPoint.getTitle();
assertNotNull(contentTitle);
- assertEquals(root + TITLE_SEPARATOR_ENCODED + child1, contentTitle);
+ assertEquals(ROOT + TITLE_SEPARATOR_ENCODED + CHILD1, contentTitle);
}
}
Added: trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/JBossToolsFocusPointTest.java
===================================================================
--- trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/JBossToolsFocusPointTest.java (rev 0)
+++ trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/JBossToolsFocusPointTest.java 2010-09-15 09:44:40 UTC (rev 24928)
@@ -0,0 +1,71 @@
+/*******************************************************************************
+ * Copyright (c) 2010 Red Hat, Inc.
+ * Distributed under license by Red Hat, Inc. All rights reserved.
+ * This program is made available under the terms of the
+ * Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
+package org.jboss.tools.usage.test;
+
+import static org.junit.Assert.*;
+
+import org.jboss.tools.usage.FocusPoint;
+import org.jboss.tools.usage.JBossToolsFocusPoint;
+import org.jboss.tools.usage.util.HttpEncodingUtils;
+import org.junit.Test;
+
+/**
+ * @author Andre Dietisheim
+ */
+public class JBossToolsFocusPointTest {
+
+ private static final String JBOSS_TOOLS_VERSION = "42.0.42";
+
+ private static final String ROOT = "root";
+
+ private static final String CHILD = "child";
+
+ private static final String URI_SEPARATOR_ENCODED = HttpEncodingUtils.checkedEncodeUtf8(FocusPoint.URI_SEPARATOR);
+
+ private static final String TITLE_SEPARATOR_ENCODED = HttpEncodingUtils
+ .checkedEncodeUtf8(FocusPoint.TITLE_SEPARATOR);
+
+ @Test
+ public void appendsJBossToolsVersionToTheEnd() throws Exception {
+ FocusPoint focusPoint = new JBossToolsFocusPointFake(ROOT)
+ .setChild(new FocusPoint(CHILD)
+ .setChild(new FocusPoint(CHILD)));
+ String contentURI = focusPoint.getURI();
+
+ assertNotNull(contentURI);
+ assertEquals( URI_SEPARATOR_ENCODED
+ + ROOT
+ + URI_SEPARATOR_ENCODED
+ + CHILD + URI_SEPARATOR_ENCODED
+ + CHILD + URI_SEPARATOR_ENCODED
+ + JBOSS_TOOLS_VERSION, contentURI);
+
+ String title = focusPoint.getTitle();
+ assertNotNull(title);
+ assertEquals(ROOT
+ + TITLE_SEPARATOR_ENCODED
+ + CHILD + TITLE_SEPARATOR_ENCODED
+ + CHILD + TITLE_SEPARATOR_ENCODED
+ + JBOSS_TOOLS_VERSION, title);
+ }
+
+ private static class JBossToolsFocusPointFake extends JBossToolsFocusPoint {
+
+ public JBossToolsFocusPointFake(String name) {
+ super(name);
+ }
+
+ @Override
+ protected String getJBossToolsVersion() {
+ return JBOSS_TOOLS_VERSION;
+ }
+ }
+}
Property changes on: trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/JBossToolsFocusPointTest.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Modified: trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/JBossToolsTestsFocusPoint.java
===================================================================
--- trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/JBossToolsTestsFocusPoint.java 2010-09-15 07:08:37 UTC (rev 24927)
+++ trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/JBossToolsTestsFocusPoint.java 2010-09-15 09:44:40 UTC (rev 24928)
@@ -11,11 +11,12 @@
package org.jboss.tools.usage.test;
import org.jboss.tools.usage.FocusPoint;
+import org.jboss.tools.usage.JBossToolsFocusPoint;
/**
* @author Andre Dietisheim
*/
-public class JBossToolsTestsFocusPoint extends FocusPoint {
+public class JBossToolsTestsFocusPoint extends JBossToolsFocusPoint {
public JBossToolsTestsFocusPoint(String childFocusPoint) {
super("tools");
Modified: trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/JBossToolsUsageIntegrationTest.java
===================================================================
--- trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/JBossToolsUsageIntegrationTest.java 2010-09-15 07:08:37 UTC (rev 24927)
+++ trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/JBossToolsUsageIntegrationTest.java 2010-09-15 09:44:40 UTC (rev 24928)
@@ -78,6 +78,16 @@
assertEquals(3, eclipseEnvironment.getVisitCount());
}
+ @Test
+ public void urlEndsWithJBossToolsVersion() {
+ IGoogleAnalyticsParameters eclipseEnvironment = new ReportingEclipseEnvironmentFake();
+ UrlRevealingTracker tracker = getTracker(eclipseEnvironment);
+ tracker.trackSynchronously(createFocusPoint("testJBossToolsVersion"));
+ assertEquals(2, eclipseEnvironment.getVisitCount());
+ tracker.trackSynchronously(createFocusPoint("testVisitCount"));
+ assertEquals(3, eclipseEnvironment.getVisitCount());
+ }
+
private String getUserId(String trackingUrl) {
Pattern pattern = Pattern.compile(".+" + IGoogleAnalyticsParameters.PARAM_COOKIES_UNIQUE_VISITOR_ID
+ "%3D([0-9]+\\.[0-9]+)\\..+");
Modified: trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/UsageTestSuite.java
===================================================================
--- trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/UsageTestSuite.java 2010-09-15 07:08:37 UTC (rev 24927)
+++ trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/UsageTestSuite.java 2010-09-15 09:44:40 UTC (rev 24928)
@@ -19,6 +19,7 @@
@RunWith(Suite.class)
@Suite.SuiteClasses({
FocusPointTest.class,
+ JBossToolsFocusPointTest.class,
GoogleAnalyticsUrlStrategyTest.class,
EclipseUserAgentTest.class,
ReportingEclipseEnvironmentTest.class,
15 years, 7 months
- 1
- 0
JBoss Tools SVN: r24927 - in trunk/bpel/plugins: org.eclipse.bpel.apache.ode.deploy.ui/src/org/eclipse/bpel/apache/ode/deploy/ui/wizards and 3 other directories.
by jbosstools-commits＠lists.jboss.org
Author: Grid.Qian
Date: 2010-09-15 03:08:37 -0400 (Wed, 15 Sep 2010)
New Revision: 24927
Modified:
trunk/bpel/plugins/org.eclipse.bpel.apache.ode.deploy.ui/src/org/eclipse/bpel/apache/ode/deploy/ui/util/DeployUtils.java
trunk/bpel/plugins/org.eclipse.bpel.apache.ode.deploy.ui/src/org/eclipse/bpel/apache/ode/deploy/ui/wizards/ODEDeployWizardPage.java
trunk/bpel/plugins/org.eclipse.bpel.ui/META-INF/MANIFEST.MF
trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/properties/ImportsSection.java
trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/wizards/NewFileWizard.java
Log:
commit for JBIDE-6588
Modified: trunk/bpel/plugins/org.eclipse.bpel.apache.ode.deploy.ui/src/org/eclipse/bpel/apache/ode/deploy/ui/util/DeployUtils.java
===================================================================
--- trunk/bpel/plugins/org.eclipse.bpel.apache.ode.deploy.ui/src/org/eclipse/bpel/apache/ode/deploy/ui/util/DeployUtils.java 2010-09-15 05:44:17 UTC (rev 24926)
+++ trunk/bpel/plugins/org.eclipse.bpel.apache.ode.deploy.ui/src/org/eclipse/bpel/apache/ode/deploy/ui/util/DeployUtils.java 2010-09-15 07:08:37 UTC (rev 24927)
@@ -44,6 +44,9 @@
import org.eclipse.jdt.core.IPackageFragmentRoot;
import org.eclipse.jdt.core.JavaCore;
import org.eclipse.jdt.core.JavaModelException;
+import org.eclipse.wst.common.componentcore.ComponentCore;
+import org.eclipse.wst.common.componentcore.ModuleCoreNature;
+import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
import org.eclipse.wst.wsdl.Definition;
import org.eclipse.wst.wsdl.Port;
import org.eclipse.wst.wsdl.Service;
@@ -247,7 +250,7 @@
}
};
try {
- IResource[] reses = project.getFolder("bpelContent").members();
+ IResource[] reses = project.getFolder(getWebContentRootPath(project)).members();
for (IResource res : reses) {
res.accept(visitor);
@@ -359,4 +362,19 @@
}
return false;
}
+
+ public static IPath getWebContentRootPath(IProject project) {
+ if (project == null)
+ return null;
+
+ if (!ModuleCoreNature.isFlexibleProject(project))
+ return null;
+
+ IPath path = null;
+ IVirtualComponent component = ComponentCore.createComponent(project);
+ if (component != null && component.exists()) {
+ path = component.getRootFolder().getProjectRelativePath();
+ }
+ return path;
+ }
}
Modified: trunk/bpel/plugins/org.eclipse.bpel.apache.ode.deploy.ui/src/org/eclipse/bpel/apache/ode/deploy/ui/wizards/ODEDeployWizardPage.java
===================================================================
--- trunk/bpel/plugins/org.eclipse.bpel.apache.ode.deploy.ui/src/org/eclipse/bpel/apache/ode/deploy/ui/wizards/ODEDeployWizardPage.java 2010-09-15 05:44:17 UTC (rev 24926)
+++ trunk/bpel/plugins/org.eclipse.bpel.apache.ode.deploy.ui/src/org/eclipse/bpel/apache/ode/deploy/ui/wizards/ODEDeployWizardPage.java 2010-09-15 07:08:37 UTC (rev 24927)
@@ -2,6 +2,7 @@
import java.io.File;
+import org.eclipse.bpel.apache.ode.deploy.ui.util.DeployUtils;
import org.eclipse.core.resources.IContainer;
import org.eclipse.core.resources.IFolder;
import org.eclipse.core.resources.IProject;
@@ -111,7 +112,7 @@
if (obj instanceof IResource) {
IProject project;
project = ((IResource) obj).getProject();
- IContainer bpelContent = project.getFolder("bpelContent");
+ IContainer bpelContent = project.getFolder(DeployUtils.getWebContentRootPath(project));
if (bpelContent != null) {
containerText.setText(bpelContent.getFullPath().toString());
} else {
Modified: trunk/bpel/plugins/org.eclipse.bpel.ui/META-INF/MANIFEST.MF
===================================================================
--- trunk/bpel/plugins/org.eclipse.bpel.ui/META-INF/MANIFEST.MF 2010-09-15 05:44:17 UTC (rev 24926)
+++ trunk/bpel/plugins/org.eclipse.bpel.ui/META-INF/MANIFEST.MF 2010-09-15 07:08:37 UTC (rev 24927)
@@ -28,7 +28,10 @@
org.eclipse.wst.xsd.ui,
org.eclipse.wst.wsdl.ui,
org.eclipse.wst.xml.ui,
- org.eclipse.ui.console;bundle-version="3.5.0"
+ org.eclipse.ui.console;bundle-version="3.5.0",
+ org.eclipse.wst.common.modulecore,
+ org.eclipse.wst.common.emfworkbench.integration,
+ org.eclipse.jem.util
Bundle-ActivationPolicy: lazy
Export-Package: org.eclipse.bpel.ui,
org.eclipse.bpel.ui.actions,
Modified: trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/properties/ImportsSection.java
===================================================================
--- trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/properties/ImportsSection.java 2010-09-15 05:44:17 UTC (rev 24926)
+++ trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/properties/ImportsSection.java 2010-09-15 07:08:37 UTC (rev 24927)
@@ -360,7 +360,7 @@
if (result.length < 1) {
return;
}
-
+
AddImportCommand cmd = new AddImportCommand(BPELUtils
.getProcess(getInput()), result[0]);
if (cmd.canDoExecute() && cmd.wouldCreateDuplicateImport() == false) {
Modified: trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/wizards/NewFileWizard.java
===================================================================
--- trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/wizards/NewFileWizard.java 2010-09-15 05:44:17 UTC (rev 24926)
+++ trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/wizards/NewFileWizard.java 2010-09-15 07:08:37 UTC (rev 24927)
@@ -20,6 +20,7 @@
import org.eclipse.core.resources.IFile;
import org.eclipse.core.resources.IProject;
import org.eclipse.core.resources.IResource;
+import org.eclipse.core.runtime.IPath;
import org.eclipse.jface.viewers.IStructuredSelection;
import org.eclipse.jface.wizard.Wizard;
import org.eclipse.swt.widgets.Display;
@@ -30,6 +31,9 @@
import org.eclipse.ui.PartInitException;
import org.eclipse.ui.ide.IDE;
import org.eclipse.ui.wizards.newresource.BasicNewResourceWizard;
+import org.eclipse.wst.common.componentcore.ComponentCore;
+import org.eclipse.wst.common.componentcore.ModuleCoreNature;
+import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
/**
* Wizard for the new process template.
@@ -220,7 +224,7 @@
project = container.getProject();
}
if (project != null) {
- IContainer bpelContent = project.getFolder("bpelContent");
+ IContainer bpelContent = project.getFolder(getWebContentRootPath(project));
if (bpelContent != null) {
return bpelContent;
}
@@ -228,6 +232,21 @@
return null;
}
+ static IPath getWebContentRootPath(IProject project) {
+ if (project == null)
+ return null;
+
+ if (!ModuleCoreNature.isFlexibleProject(project))
+ return null;
+
+ IPath path = null;
+ IVirtualComponent component = ComponentCore.createComponent(project);
+ if (component != null && component.exists()) {
+ path = component.getRootFolder().getProjectRelativePath();
+ }
+ return path;
+ }
+
/**
*
* Final condition for the wizard to finish
15 years, 7 months
- 1
- 0
JBoss Tools SVN: r24926 - in trunk/bpel/plugins/org.jboss.tools.bpel.runtimes: src/org/jboss/tools/bpel/runtimes and 3 other directories.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2010-09-15 01:44:17 -0400 (Wed, 15 Sep 2010)
New Revision: 24926
Added:
trunk/bpel/plugins/org.jboss.tools.bpel.runtimes/src/org/jboss/tools/bpel/runtimes/facets/BPELFacetInstallDataModelProvider.java
trunk/bpel/plugins/org.jboss.tools.bpel.runtimes/src/org/jboss/tools/bpel/runtimes/module/BPELDeployable.java
trunk/bpel/plugins/org.jboss.tools.bpel.runtimes/src/org/jboss/tools/bpel/runtimes/ui/wizards/BPELFacetInstallPage.java
Modified:
trunk/bpel/plugins/org.jboss.tools.bpel.runtimes/plugin.xml
trunk/bpel/plugins/org.jboss.tools.bpel.runtimes/src/org/jboss/tools/bpel/runtimes/IBPELModuleFacetConstants.java
trunk/bpel/plugins/org.jboss.tools.bpel.runtimes/src/org/jboss/tools/bpel/runtimes/facets/BPELCoreFacetInstallDelegate.java
trunk/bpel/plugins/org.jboss.tools.bpel.runtimes/src/org/jboss/tools/bpel/runtimes/module/BPELModuleFactoryDelegate.java
Log:
Changes from eclipse bpel, ported to our runtime plugin.
Modified: trunk/bpel/plugins/org.jboss.tools.bpel.runtimes/plugin.xml
===================================================================
--- trunk/bpel/plugins/org.jboss.tools.bpel.runtimes/plugin.xml 2010-09-15 01:22:15 UTC (rev 24925)
+++ trunk/bpel/plugins/org.jboss.tools.bpel.runtimes/plugin.xml 2010-09-15 05:44:17 UTC (rev 24926)
@@ -31,6 +31,13 @@
</wizard>
</extension>
+ <extension point="org.eclipse.wst.common.project.facet.ui.wizardPages">
+ <wizard-pages action="bpel.facet.core.install">
+ <page class="org.jboss.tools.bpel.runtimes.ui.wizards.BPELFacetInstallPage"/>
+ </wizard-pages>
+ </extension>
+
+
<!--=========================================================================-->
<!-- BPEL ModuleType -->
<!--=========================================================================-->
@@ -72,10 +79,13 @@
<conflicts group="modules"/>
</and>
</constraint>
- <action type="install">
- <delegate class="org.jboss.tools.bpel.runtimes.facets.BPELCoreFacetInstallDelegate"/>
- </action>
- </project-facet-version>
+ </project-facet-version>
+
+ <action facet="jbt.bpel.facet.core" version="2.0" type="INSTALL" id="bpel.facet.core.install">
+ <delegate class="org.jboss.tools.bpel.runtimes.facets.BPELCoreFacetInstallDelegate"/>
+ <config-factory class="org.jboss.tools.bpel.runtimes.facets.BPELFacetInstallDataModelProvider"/>
+ </action>
+
<category id="bpel.category">
<label>%BPEL_FACET_CATEGORY_LABEL</label>
Modified: trunk/bpel/plugins/org.jboss.tools.bpel.runtimes/src/org/jboss/tools/bpel/runtimes/IBPELModuleFacetConstants.java
===================================================================
--- trunk/bpel/plugins/org.jboss.tools.bpel.runtimes/src/org/jboss/tools/bpel/runtimes/IBPELModuleFacetConstants.java 2010-09-15 01:22:15 UTC (rev 24925)
+++ trunk/bpel/plugins/org.jboss.tools.bpel.runtimes/src/org/jboss/tools/bpel/runtimes/IBPELModuleFacetConstants.java 2010-09-15 05:44:17 UTC (rev 24926)
@@ -16,7 +16,11 @@
* @author Bruno Wassermann, written Jun 29, 2006
*/
public interface IBPELModuleFacetConstants {
+
+ public final static String BPEL_CONTENT_FOLDER = "BPELFacetInstallDataModelProvider.contentRoot";
+ public final static String BPEL_CONTENT_DEFAULT_FOLDER = "bpelContent";
+
// module types
public final static String BPEL_MODULE_TYPE = "jbt.bpel.module"; //$NON-NLS-1$
Modified: trunk/bpel/plugins/org.jboss.tools.bpel.runtimes/src/org/jboss/tools/bpel/runtimes/facets/BPELCoreFacetInstallDelegate.java
===================================================================
--- trunk/bpel/plugins/org.jboss.tools.bpel.runtimes/src/org/jboss/tools/bpel/runtimes/facets/BPELCoreFacetInstallDelegate.java 2010-09-15 01:22:15 UTC (rev 24925)
+++ trunk/bpel/plugins/org.jboss.tools.bpel.runtimes/src/org/jboss/tools/bpel/runtimes/facets/BPELCoreFacetInstallDelegate.java 2010-09-15 05:44:17 UTC (rev 24926)
@@ -25,6 +25,7 @@
import org.eclipse.jst.common.project.facet.WtpUtils;
import org.eclipse.wst.common.componentcore.internal.util.IComponentImplFactory;
import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
+import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
import org.eclipse.wst.common.project.facet.core.IDelegate;
import org.eclipse.wst.common.project.facet.core.IProjectFacetVersion;
import org.jboss.ide.eclipse.as.wtp.core.util.VCFUtil;
@@ -60,12 +61,15 @@
IProgressMonitor progMon) throws CoreException {
progMon.beginTask("Configuring ...", 300); //$NON-NLS-1$
-
+ IDataModel model = (IDataModel)obj;
+ String contentRoot = (String)model.getProperty(IBPELModuleFacetConstants.BPEL_CONTENT_FOLDER);
+ contentRoot = (contentRoot == null || "".equals(contentRoot)) ? IBPELModuleFacetConstants.BPEL_CONTENT_DEFAULT_FOLDER : contentRoot;
+
// add natures
WtpUtils.addNatures(proj);
// Create the content folder
- IFolder bpelContent = proj.getFolder(IBPELModuleFacetConstants.BPEL_CONTENT);
+ IFolder bpelContent = proj.getFolder(contentRoot);
bpelContent.create(true,true, null);
// create the virtual component
@@ -75,17 +79,10 @@
progMon.worked(100);
// Add the resource mapping to bpelContent
- newComponent.getRootFolder().createLink(new Path("/" + IBPELModuleFacetConstants.BPEL_CONTENT), 0, null);
-
- // Add an output folder mapping
- IVirtualComponent outputFoldersComponent = new OutputFoldersVirtualComponent(
- proj, newComponent);
- VCFUtil.addReference(outputFoldersComponent, newComponent, "/", null);
+ newComponent.getRootFolder().createLink(new Path("/" + contentRoot), 0, null);
progMon.worked(100);
-
// Add builder
addBuilder(proj, new SubProgressMonitor(progMon, 100));
-
progMon.done();
}
Added: trunk/bpel/plugins/org.jboss.tools.bpel.runtimes/src/org/jboss/tools/bpel/runtimes/facets/BPELFacetInstallDataModelProvider.java
===================================================================
--- trunk/bpel/plugins/org.jboss.tools.bpel.runtimes/src/org/jboss/tools/bpel/runtimes/facets/BPELFacetInstallDataModelProvider.java (rev 0)
+++ trunk/bpel/plugins/org.jboss.tools.bpel.runtimes/src/org/jboss/tools/bpel/runtimes/facets/BPELFacetInstallDataModelProvider.java 2010-09-15 05:44:17 UTC (rev 24926)
@@ -0,0 +1,29 @@
+package org.jboss.tools.bpel.runtimes.facets;
+
+import java.util.Set;
+
+import org.eclipse.wst.common.componentcore.datamodel.FacetInstallDataModelProvider;
+import org.eclipse.wst.common.componentcore.datamodel.properties.IFacetDataModelProperties;
+import org.eclipse.wst.common.project.facet.core.IActionConfigFactory;
+import org.jboss.tools.bpel.runtimes.IBPELModuleFacetConstants;
+
+public class BPELFacetInstallDataModelProvider extends
+ FacetInstallDataModelProvider implements IActionConfigFactory, IFacetDataModelProperties, IBPELModuleFacetConstants {
+
+ @Override
+ public Set getPropertyNames() {
+ Set names = super.getPropertyNames();
+ names.add(FACET_PROJECT_NAME);
+ names.add(FACET_ID);
+ names.add(BPEL_CONTENT_FOLDER);
+ return names;
+ }
+
+ @Override
+ public Object getDefaultProperty(String propertyName) {
+ if (propertyName.equals(FACET_ID)) {
+ return IBPELModuleFacetConstants.BPEL_PROJECT_FACET;
+ }
+ return super.getDefaultProperty(propertyName);
+ }
+}
Added: trunk/bpel/plugins/org.jboss.tools.bpel.runtimes/src/org/jboss/tools/bpel/runtimes/module/BPELDeployable.java
===================================================================
--- trunk/bpel/plugins/org.jboss.tools.bpel.runtimes/src/org/jboss/tools/bpel/runtimes/module/BPELDeployable.java (rev 0)
+++ trunk/bpel/plugins/org.jboss.tools.bpel.runtimes/src/org/jboss/tools/bpel/runtimes/module/BPELDeployable.java 2010-09-15 05:44:17 UTC (rev 24926)
@@ -0,0 +1,37 @@
+package org.jboss.tools.bpel.runtimes.module;
+
+import org.eclipse.core.resources.IProject;
+import org.eclipse.wst.common.componentcore.internal.flat.IFlattenParticipant;
+import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
+import org.eclipse.wst.web.internal.deployables.FlatComponentDeployable;
+
+public class BPELDeployable extends FlatComponentDeployable {
+
+ public BPELDeployable(IProject project) {
+ super(project);
+ }
+
+ public BPELDeployable(IProject project, IVirtualComponent aComponent) {
+ super(project, aComponent);
+ }
+
+ @Override
+ public boolean shouldCache() {
+ return true;
+ }
+
+ /*
+ * (non-Javadoc)
+ * @see org.eclipse.bpel.runtimes.module.FlatComponentDeployable#getParticipants()
+ */
+ protected IFlattenParticipant[] getParticipants() {
+ /*
+ * No work really needs to be done here. The BPEL project
+ * doesn't need to map source in instead, it doesn't need to
+ * update a manifest file, it doesn't need to add in classpath dependencies, etc etc
+ *
+ * Just standard traversals as of now.
+ */
+ return super.getParticipants();
+ }
+}
Modified: trunk/bpel/plugins/org.jboss.tools.bpel.runtimes/src/org/jboss/tools/bpel/runtimes/module/BPELModuleFactoryDelegate.java
===================================================================
--- trunk/bpel/plugins/org.jboss.tools.bpel.runtimes/src/org/jboss/tools/bpel/runtimes/module/BPELModuleFactoryDelegate.java 2010-09-15 01:22:15 UTC (rev 24925)
+++ trunk/bpel/plugins/org.jboss.tools.bpel.runtimes/src/org/jboss/tools/bpel/runtimes/module/BPELModuleFactoryDelegate.java 2010-09-15 05:44:17 UTC (rev 24926)
@@ -10,24 +10,164 @@
******************************************************************************/
package org.jboss.tools.bpel.runtimes.module;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+
import org.eclipse.core.resources.IProject;
-import org.jboss.ide.eclipse.as.wtp.core.modules.JBTProjectModuleDelegate;
-import org.jboss.ide.eclipse.as.wtp.core.modules.JBTProjectModuleFactory;
+import org.eclipse.core.resources.IResourceChangeEvent;
+import org.eclipse.core.resources.IResourceChangeListener;
+import org.eclipse.core.resources.ResourcesPlugin;
+import org.eclipse.core.runtime.IPath;
+import org.eclipse.core.runtime.NullProgressMonitor;
+import org.eclipse.core.runtime.Path;
+import org.eclipse.wst.common.componentcore.ComponentCore;
+import org.eclipse.wst.common.componentcore.internal.StructureEdit;
+import org.eclipse.wst.common.componentcore.internal.util.FacetedProjectUtilities;
+import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
+import org.eclipse.wst.server.core.IModule;
+import org.eclipse.wst.server.core.internal.ModuleFactory;
+import org.eclipse.wst.server.core.internal.ServerPlugin;
+import org.eclipse.wst.server.core.model.ModuleDelegate;
+import org.eclipse.wst.server.core.util.ProjectModuleFactoryDelegate;
+import org.eclipse.wst.web.internal.deployables.FlatComponentDeployable;
import org.jboss.tools.bpel.runtimes.IBPELModuleFacetConstants;
-public class BPELModuleFactoryDelegate extends JBTProjectModuleFactory {
+public class BPELModuleFactoryDelegate extends ProjectModuleFactoryDelegate implements IResourceChangeListener {
+ protected Map <IModule, FlatComponentDeployable> moduleDelegates = new HashMap<IModule, FlatComponentDeployable>(5);
+
public static final String FACTORY_ID = "org.jboss.tools.bpel.runtimes.module.moduleFactory";
public static final String MODULE_TYPE = IBPELModuleFacetConstants.BPEL_MODULE_TYPE;
+ public static BPELModuleFactoryDelegate FACTORY;
+ public static BPELModuleFactoryDelegate factoryInstance() {
+ if( FACTORY == null ) {
+ ensureFactoryLoaded(FACTORY_ID);
+ }
+ return FACTORY;
+ }
+ public static void ensureFactoryLoaded(String factoryId) {
+ ModuleFactory[] factories = ServerPlugin.getModuleFactories();
+ for( int i = 0; i < factories.length; i++ ) {
+ if( factories[i].getId().equals(factoryId)) {
+ factories[i].getDelegate(new NullProgressMonitor());
+ }
+ }
+ }
+
+ public BPELModuleFactoryDelegate() {
+ super();
+ }
+ @Override
+ public void initialize() {
+ super.initialize();
+ if( getId().equals(FACTORY))
+ FACTORY = this;
+ ResourcesPlugin.getWorkspace().addResourceChangeListener(this);
+ }
+
+ @Override
+ protected IModule[] createModules(IProject project) {
+ IVirtualComponent component = ComponentCore.createComponent(project);
+ if(component != null)
+ return createModuleDelegates(component);
+ return null;
+ }
- public String getFactoryId() {
- return FACTORY_ID;
+
+ @Override
+ public ModuleDelegate getModuleDelegate(IModule module) {
+ if (module == null)
+ return null;
+
+ ModuleDelegate md = moduleDelegates.get(module);
+// if( md == null && ((Module)module).getInternalId().startsWith(BINARY_PREFIX))
+// return createDelegate(module);
+
+ if (md == null) {
+ createModules(module.getProject());
+ md = moduleDelegates.get(module);
+ }
+ return md;
}
- public BPELModuleFactoryDelegate() {
- super(MODULE_TYPE, IBPELModuleFacetConstants.BPEL_PROJECT_FACET);
+ protected boolean canHandleProject(IProject p) {
+ return FacetedProjectUtilities.isProjectOfType(p, IBPELModuleFacetConstants.BPEL_PROJECT_FACET);
}
+
+ protected IModule[] createModuleDelegates(IVirtualComponent component) {
+ if(component == null){
+ return null;
+ }
+
+ List<IModule> projectModules = new ArrayList<IModule>();
+ try {
+ if (canHandleProject(component.getProject())) {
+ String type = IBPELModuleFacetConstants.BPEL_MODULE_TYPE;
+ String version = IBPELModuleFacetConstants.BPEL20_VERSION;
+ IModule module = createModule(component.getName(), component.getName(), type, version, component.getProject());
+ FlatComponentDeployable moduleDelegate = createModuleDelegate(component.getProject(), component);
+ moduleDelegates.put(module, moduleDelegate);
+ projectModules.add(module);
+ } else {
+ return null;
+ }
+ } catch (Exception e) {
+// e.printStackTrace();
+// J2EEPlugin.logError(e);
+ }
+ return projectModules.toArray(new IModule[projectModules.size()]);
+ }
- protected JBTProjectModuleDelegate createDelegate(IProject project) {
- return new BPELModuleDelegate(project);
+ protected FlatComponentDeployable createModuleDelegate(IProject project, IVirtualComponent component) {
+ return new BPELDeployable(project, component);
}
-}
+
+ /**
+ * Returns the list of resources that the module should listen to for state
+ * changes. The paths should be project relative paths. Subclasses can
+ * override this method to provide the paths.
+ *
+ * @return a possibly empty array of paths
+ */
+ @Override
+ protected IPath[] getListenerPaths() {
+ return new IPath[] { new Path(".project"), // nature //$NON-NLS-1$
+ new Path(StructureEdit.MODULE_META_FILE_NAME), // component
+ new Path(".settings/org.eclipse.wst.common.project.facet.core.xml") // facets //$NON-NLS-1$
+ };
+ }
+
+ @Override
+ protected void clearCache(IProject project) {
+ super.clearCache(project);
+ List<IModule> modulesToRemove = null;
+ for (Iterator<IModule> iterator = moduleDelegates.keySet().iterator(); iterator.hasNext();) {
+ IModule module = iterator.next();
+ if (module.getProject().equals(project)) {
+ if (modulesToRemove == null) {
+ modulesToRemove = new ArrayList<IModule>();
+ }
+ modulesToRemove.add(module);
+ }
+ }
+ if (modulesToRemove != null) {
+ for (IModule module : modulesToRemove) {
+ moduleDelegates.remove(module);
+ }
+ }
+ }
+
+ public void resourceChanged(IResourceChangeEvent event) {
+ cleanAllDelegates();
+ }
+
+ protected void cleanAllDelegates() {
+ Iterator<FlatComponentDeployable> i = moduleDelegates.values().iterator();
+ while(i.hasNext()) {
+ i.next().clearCache();
+ }
+ modulesChanged();
+ }
+}
\ No newline at end of file
Added: trunk/bpel/plugins/org.jboss.tools.bpel.runtimes/src/org/jboss/tools/bpel/runtimes/ui/wizards/BPELFacetInstallPage.java
===================================================================
--- trunk/bpel/plugins/org.jboss.tools.bpel.runtimes/src/org/jboss/tools/bpel/runtimes/ui/wizards/BPELFacetInstallPage.java (rev 0)
+++ trunk/bpel/plugins/org.jboss.tools.bpel.runtimes/src/org/jboss/tools/bpel/runtimes/ui/wizards/BPELFacetInstallPage.java 2010-09-15 05:44:17 UTC (rev 24926)
@@ -0,0 +1,46 @@
+package org.jboss.tools.bpel.runtimes.ui.wizards;
+
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Label;
+import org.eclipse.swt.widgets.Text;
+import org.eclipse.wst.common.project.facet.ui.IFacetWizardPage;
+import org.eclipse.wst.web.ui.internal.wizards.DataModelFacetInstallPage;
+import org.jboss.tools.bpel.runtimes.IBPELModuleFacetConstants;
+
+public class BPELFacetInstallPage extends DataModelFacetInstallPage implements
+ IFacetWizardPage {
+
+ private Label contentDirLabel;
+ private Text contentDir;
+ public BPELFacetInstallPage() {
+ super("Test BPEL");
+ setTitle("BPEL Title");
+ setDescription("BPEL Description");
+ }
+
+ @Override
+ protected String[] getValidationPropertyNames() {
+ return new String[]{IBPELModuleFacetConstants.BPEL_CONTENT_FOLDER};
+ }
+
+ @Override
+ protected Composite createTopLevelComposite(Composite parent) {
+ final Composite composite = new Composite(parent, SWT.NONE);
+ composite.setLayout(new GridLayout(2, false));
+ this.contentDirLabel = new Label(composite, SWT.NONE);
+ this.contentDirLabel.setText("Content Folder");
+ this.contentDirLabel.setLayoutData(new GridData());
+
+ this.contentDir = new Text(composite, SWT.BORDER);
+ this.contentDir.setLayoutData(gdhfill());
+ this.contentDir.setData("label", this.contentDirLabel); //$NON-NLS-1$
+ this.synchHelper.synchText(contentDir, IBPELModuleFacetConstants.BPEL_CONTENT_FOLDER, null);
+ this.contentDir.setText(IBPELModuleFacetConstants.BPEL_CONTENT_DEFAULT_FOLDER);
+ new Label(composite, SWT.NONE); // pad
+ return composite;
+ }
+
+}
15 years, 7 months
- 1
- 0
JBoss Tools SVN: r24925 - in trunk/documentation/guides/GettingStartedGuide/en-US: images/getting_started and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: irooskov(a)redhat.com
Date: 2010-09-14 21:22:15 -0400 (Tue, 14 Sep 2010)
New Revision: 24925
Added:
trunk/documentation/guides/GettingStartedGuide/en-US/images/getting_started/usage_plug-in_2.png
Modified:
trunk/documentation/guides/GettingStartedGuide/en-US/getting_started.xml
Log:
updated with rest of usage plug-in information
Modified: trunk/documentation/guides/GettingStartedGuide/en-US/getting_started.xml
===================================================================
--- trunk/documentation/guides/GettingStartedGuide/en-US/getting_started.xml 2010-09-14 23:12:59 UTC (rev 24924)
+++ trunk/documentation/guides/GettingStartedGuide/en-US/getting_started.xml 2010-09-15 01:22:15 UTC (rev 24925)
@@ -882,7 +882,7 @@
</section>
<section id="Usage_Reporting">
- <title>Reporting Usage</title>
+ <title>Usage Reporting</title>
<para>
The JBoss Developer Studio now includes a usage plug-in that anonymously reports information back to JBoss. The plug-in is not enabled by default. To enable, make sure the <guilabel>Report usage of JBoss Tools to JBoss Tools team.</guilabel> box is ticked.
</para>
@@ -895,6 +895,23 @@
<para>
Once enabled, the plug-in will remain active until turned off. To turn the active plug-in off, navigate to <menuchoice><guimenuitem>Window</guimenuitem><guimenuitem>Preferences</guimenuitem><guimenuitem>JBoss Tools</guimenuitem><guimenuitem>Usage Reporting Preferences</guimenuitem></menuchoice>.
</para>
+ <para>
+ The gathered data allows JBoss to see how the tools are being used and where they are being used geographically. Currently we are looking into the operating systems being used, screen resolution and how often the tooling environment is started. In the future geographic information will assist in focussing translation resources to areas where the developer environment is most used.
+ </para>
+ <para>
+ The plug-in uses Google Analytics to track and report data by acting as if you were visiting the site http://jboss.org/tools/usage/. To provide a guide to the type of information being collected refer to <xref linkend="Collected_information_guide"/>.
+ </para>
+ <figure id="Collected_information_guide">
+ <title>Collected information guide</title>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/getting_started/usage_plug-in_2.png"/>
+ </imageobject>
+ </mediaobject>
+ </figure>
+ <para>
+ To view the sourcecode of the usage plug-in visit <ulink url="http://anonsvn.jboss.org/repos/jbosstools/trunk/usage/">http://anonsvn.jboss.org/repos/jbosstools/trunk/usage/</ulink>.
+ </para>
</section>
<section id="Support">
Added: trunk/documentation/guides/GettingStartedGuide/en-US/images/getting_started/usage_plug-in_2.png
===================================================================
(Binary files differ)
Property changes on: trunk/documentation/guides/GettingStartedGuide/en-US/images/getting_started/usage_plug-in_2.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
15 years, 7 months
- 1
- 0
JBoss Tools SVN: r24924 - trunk/bpel/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/factory.
by jbosstools-commits＠lists.jboss.org
Author: bbrodt
Date: 2010-09-14 19:12:59 -0400 (Tue, 14 Sep 2010)
New Revision: 24924
Modified:
trunk/bpel/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/factory/AdapterFactory.java
Log:
Bugzilla 323858 and JBIDE-6472
Looks like this patch never made it into trunk - I just happened to stumble on this while triaging the BPEL bugzillas over at eclipse.org
Modified: trunk/bpel/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/factory/AdapterFactory.java
===================================================================
--- trunk/bpel/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/factory/AdapterFactory.java 2010-09-14 18:53:06 UTC (rev 24923)
+++ trunk/bpel/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/factory/AdapterFactory.java 2010-09-14 23:12:59 UTC (rev 24924)
@@ -127,6 +127,10 @@
if (r == null) {
return null;
}
+ // Bugzilla 323858 and JBIDE-6472
+ else if ( r.getURI()==null ) {
+ return null;
+ }
return getFileFromURI ( r.getURI() );
}
15 years, 7 months
- 1
- 0
JBoss Tools SVN: r24923 - in trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui: src/org/jboss/tools/deltacloud/ui/views and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: jjohnstn
Date: 2010-09-14 14:53:06 -0400 (Tue, 14 Sep 2010)
New Revision: 24923
Modified:
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/ChangeLog
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/ImageView.java
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/InstanceView.java
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/ManageKeysPage.java
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/NewCloudConnectionPage.java
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/NewInstancePage.java
Log:
2010-09-14 Jeff Johnston <jjohnstn(a)redhat.com>
* src/org/jboss/tools/deltacloud/ui/views/ImageView.java (createPartControl): For vertical
centering, calculate the actual height difference between widgets and divide by
2 to find centering offset. Do not hard-code a value for this.
* src/org/jboss/tools/deltacloud/ui/views/InstanceView.java (createPartControl): Ditto.
* src/org/jboss/tools/internal/deltacloud/ui/wizards/ManageKeysPage.java (createControl): Ditto.
* src/org/jboss/tools/internal/deltacloud/ui/wizards/NewCloudConnectionPage.java (createControl): Ditto.
* src/org/jboss/tools/internal/deltacloud/ui/wizards/NewInstancePage.java (createControl): Ditto.
Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/ChangeLog
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/ChangeLog 2010-09-14 18:02:15 UTC (rev 24922)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/ChangeLog 2010-09-14 18:53:06 UTC (rev 24923)
@@ -1,5 +1,15 @@
2010-09-14 Jeff Johnston <jjohnstn(a)redhat.com>
+ * src/org/jboss/tools/deltacloud/ui/views/ImageView.java (createPartControl): For vertical
+ centering, calculate the actual height difference between widgets and divide by
+ 2 to find centering offset. Do not hard-code a value for this.
+ * src/org/jboss/tools/deltacloud/ui/views/InstanceView.java (createPartControl): Ditto.
+ * src/org/jboss/tools/internal/deltacloud/ui/wizards/ManageKeysPage.java (createControl): Ditto.
+ * src/org/jboss/tools/internal/deltacloud/ui/wizards/NewCloudConnectionPage.java (createControl): Ditto.
+ * src/org/jboss/tools/internal/deltacloud/ui/wizards/NewInstancePage.java (createControl): Ditto.
+
+2010-09-14 Jeff Johnston <jjohnstn(a)redhat.com>
+
* src/org/jboss/tools/deltacloud/ui/DeltaCloudPerspective.java (createInitialLayout): Fix
initial view placement by putting all the bottom views into a single folder.
* src/org/jboss/tools/deltacloud/ui/views/CVMessages.properties: Fix message for
Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/ImageView.java
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/ImageView.java 2010-09-14 18:02:15 UTC (rev 24922)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/ImageView.java 2010-09-14 18:53:06 UTC (rev 24923)
@@ -33,6 +33,7 @@
import org.eclipse.swt.events.SelectionEvent;
import org.eclipse.swt.events.VerifyEvent;
import org.eclipse.swt.events.VerifyListener;
+import org.eclipse.swt.graphics.Point;
import org.eclipse.swt.layout.FormAttachment;
import org.eclipse.swt.layout.FormData;
import org.eclipse.swt.layout.FormLayout;
@@ -206,8 +207,12 @@
currCloud.addImageListListener(parentView);
}
+ Point p1 = cloudSelectorLabel.computeSize(SWT.DEFAULT, SWT.DEFAULT);
+ Point p2 = cloudSelector.computeSize(SWT.DEFAULT, SWT.DEFAULT);
+ int centering = (p2.y - p1.y + 1) / 2;
+
FormData f = new FormData();
- f.top = new FormAttachment(0, 8);
+ f.top = new FormAttachment(0, 5 + centering);
f.left = new FormAttachment(0, 30);
cloudSelectorLabel.setLayoutData(f);
Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/InstanceView.java
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/InstanceView.java 2010-09-14 18:02:15 UTC (rev 24922)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/InstanceView.java 2010-09-14 18:53:06 UTC (rev 24923)
@@ -46,6 +46,7 @@
import org.eclipse.swt.events.SelectionEvent;
import org.eclipse.swt.events.VerifyEvent;
import org.eclipse.swt.events.VerifyListener;
+import org.eclipse.swt.graphics.Point;
import org.eclipse.swt.layout.FormAttachment;
import org.eclipse.swt.layout.FormData;
import org.eclipse.swt.layout.FormLayout;
@@ -236,8 +237,12 @@
currCloud.addInstanceListListener(parentView);
}
+ Point p1 = cloudSelectorLabel.computeSize(SWT.DEFAULT, SWT.DEFAULT);
+ Point p2 = cloudSelector.computeSize(SWT.DEFAULT, SWT.DEFAULT);
+ int centering = (p2.y - p1.y + 1) / 2;
+
FormData f = new FormData();
- f.top = new FormAttachment(0, 8);
+ f.top = new FormAttachment(0, 5 + centering);
f.left = new FormAttachment(0, 30);
cloudSelectorLabel.setLayoutData(f);
Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/ManageKeysPage.java
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/ManageKeysPage.java 2010-09-14 18:02:15 UTC (rev 24922)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/ManageKeysPage.java 2010-09-14 18:53:06 UTC (rev 24923)
@@ -247,9 +247,15 @@
}
});
+ Point p1 = dirLabel.computeSize(SWT.DEFAULT, SWT.DEFAULT);
+ Point p2 = directory.computeSize(SWT.DEFAULT, SWT.DEFAULT);
+ Point p3 = browseButton.computeSize(SWT.DEFAULT, SWT.DEFAULT);
+ int centering = (p2.y - p1.y + 1) / 2;
+ int centering2 = (p3.y - p2.y + 1) / 2;
+
FormData f = new FormData();
f.left = new FormAttachment(0, 5);
- f.top = new FormAttachment(0, 8);
+ f.top = new FormAttachment(0, 5 + centering + centering2);
dirLabel.setLayoutData(f);
f = new FormData();
@@ -259,7 +265,7 @@
f = new FormData();
f.left = new FormAttachment(dirLabel, 5);
- f.top = new FormAttachment(0, 5);
+ f.top = new FormAttachment(0, 5 + centering2);
f.right = new FormAttachment(browseButton, -10);
directory.setLayoutData(f);
Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/NewCloudConnectionPage.java
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/NewCloudConnectionPage.java 2010-09-14 18:02:15 UTC (rev 24922)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/NewCloudConnectionPage.java 2010-09-14 18:53:06 UTC (rev 24923)
@@ -340,9 +340,15 @@
Label urlLabel = new Label(container, SWT.NULL);
urlLabel.setText(WizardMessages.getString(URL_LABEL));
+ Point p1 = urlLabel.computeSize(SWT.DEFAULT, SWT.DEFAULT);
+ System.out.println("p1 is x:" + p1.x + " y:" + p1.y);
urlText = new Text(container, SWT.BORDER | SWT.SINGLE);
urlText.addModifyListener(textListener);
+ Point p2 = urlText.computeSize(SWT.DEFAULT, SWT.DEFAULT);
+ System.out.println("p2 text is x:" + p2.x + " y:" + p2.y);
+
+ int centering = (p2.y - p1.y + 1) / 2;
Label typeLabel = new Label(container, SWT.NULL);
typeLabel.setText(WizardMessages.getString(TYPE_LABEL));
@@ -382,7 +388,7 @@
dummyLabel.setLayoutData(f);
f = new FormData();
- f.top = new FormAttachment(dummyLabel, 11);
+ f.top = new FormAttachment(dummyLabel, 8 + centering);
nameLabel.setLayoutData(f);
f = new FormData();
@@ -392,7 +398,7 @@
nameText.setLayoutData(f);
f = new FormData();
- f.top = new FormAttachment(nameText, 8);
+ f.top = new FormAttachment(nameText, 5 + centering);
urlLabel.setLayoutData(f);
f = new FormData();
@@ -402,17 +408,17 @@
urlText.setLayoutData(f);
f = new FormData();
- f.top = new FormAttachment(urlText, 8);
+ f.top = new FormAttachment(urlText, 5 + centering);
typeLabel.setLayoutData(f);
f = new FormData();
f.left = new FormAttachment(urlText, 0, SWT.LEFT);
- f.top = new FormAttachment(urlText, 8);
+ f.top = new FormAttachment(urlText, 5 + centering);
f.right = new FormAttachment(100, 0);
typeText.setLayoutData(f);
f = new FormData();
- f.top = new FormAttachment(typeText, 16);
+ f.top = new FormAttachment(typeText, 10 + centering);
usernameLabel.setLayoutData(f);
f = new FormData();
@@ -427,7 +433,7 @@
ec2userLink.setLayoutData(f);
f = new FormData();
- f.top = new FormAttachment(ec2userLink, 8);
+ f.top = new FormAttachment(ec2userLink, 5 + centering);
passwordLabel.setLayoutData(f);
f = new FormData();
Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/NewInstancePage.java
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/NewInstancePage.java 2010-09-14 18:02:15 UTC (rev 24922)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/NewInstancePage.java 2010-09-14 18:53:06 UTC (rev 24923)
@@ -285,13 +285,17 @@
hardware.addModifyListener(comboListener);
}
+ Point p1 = nameLabel.computeSize(SWT.DEFAULT, SWT.DEFAULT);
+ Point p2 = nameText.computeSize(SWT.DEFAULT, SWT.DEFAULT);
+ int centering = (p2.y - p1.y + 1) / 2;
+
FormData f = new FormData();
f.left = new FormAttachment(0, 0);
f.right = new FormAttachment(100, 0);
dummyLabel.setLayoutData(f);
f = new FormData();
- f.top = new FormAttachment(dummyLabel, 8);
+ f.top = new FormAttachment(dummyLabel, 8 + centering);
f.left = new FormAttachment(0, 0);
nameLabel.setLayoutData(f);
@@ -323,7 +327,7 @@
arch.setLayoutData(f);
f = new FormData();
- f.top = new FormAttachment(archLabel, 11);
+ f.top = new FormAttachment(arch, 8 + centering);
f.left = new FormAttachment(0, 0);
realmLabel.setLayoutData(f);
@@ -348,9 +352,11 @@
keyManage = new Button(container, SWT.NULL);
keyManage.setText(WizardMessages.getString(MANAGE_BUTTON_LABEL));
keyManage.addSelectionListener(manageListener);
+ Point p3 = keyManage.computeSize(SWT.DEFAULT, SWT.DEFAULT);
+ int centering2 = (p3.y - p2.y + 1) / 2;
f = new FormData();
- f.top = new FormAttachment(realm, 11);
+ f.top = new FormAttachment(realm, 8 + centering + centering2);
f.left = new FormAttachment(0, 0);
keyLabel.setLayoutData(f);
@@ -363,7 +369,7 @@
keyManage.setLayoutData(f);
f = new FormData();
- f.top = new FormAttachment(realm, 8);
+ f.top = new FormAttachment(realm, 8 + centering2);
f.left = new FormAttachment(hardwareLabel, 5);
f.right = new FormAttachment(keyManage, -10);
keyText.setLayoutData(f);
@@ -372,7 +378,7 @@
}
f = new FormData();
- f.top = new FormAttachment(control, 11);
+ f.top = new FormAttachment(control, 8 + centering);
f.left = new FormAttachment(0, 0);
hardwareLabel.setLayoutData(f);
15 years, 7 months
- 1
- 0