JBoss Tools SVN: r37501 - trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core.
by jbosstools-commits＠lists.jboss.org
Author: akazakov
Date: 2011-12-21 17:35:17 -0500 (Wed, 21 Dec 2011)
New Revision: 37501
Modified:
trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/SeamJavaComponentDeclaration.java
Log:
https://issues.jboss.org/browse/JBIDE-10187 Add support for a @SuppressWarnings
Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/SeamJavaComponentDeclaration.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/SeamJavaComponentDeclaration.java 2011-12-21 21:55:56 UTC (rev 37500)
+++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/SeamJavaComponentDeclaration.java 2011-12-21 22:35:17 UTC (rev 37501)
@@ -18,18 +18,21 @@
import java.util.Properties;
import java.util.Set;
+import org.eclipse.core.resources.IResource;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.jdt.core.IJavaElement;
import org.eclipse.jdt.core.IMember;
import org.eclipse.jdt.core.IType;
import org.eclipse.jdt.core.JavaModelException;
import org.eclipse.jdt.ui.JavaUI;
+import org.jboss.tools.common.java.IJavaSourceReference;
import org.jboss.tools.common.meta.action.impl.SpecialWizardSupport;
import org.jboss.tools.common.model.ServiceDialog;
import org.jboss.tools.common.model.options.PreferenceModelUtilities;
import org.jboss.tools.common.model.project.ext.IValueInfo;
import org.jboss.tools.common.model.project.ext.event.Change;
import org.jboss.tools.common.model.util.EclipseJavaUtil;
+import org.jboss.tools.common.text.ITextSourceReference;
import org.jboss.tools.common.xml.XMLUtilities;
import org.jboss.tools.jst.web.model.project.ext.store.XMLStoreHelper;
import org.jboss.tools.seam.core.BeanType;
@@ -83,6 +86,33 @@
return result;
}
+ @Override
+ public ITextSourceReference getLocationFor(String path) {
+ final IValueInfo valueInfo = attributes.get(path);
+ IJavaSourceReference reference = new IJavaSourceReference() {
+ public int getLength() {
+ return valueInfo != null ? valueInfo.getLength() : 0;
+ }
+
+ public int getStartPosition() {
+ return valueInfo != null ? valueInfo.getStartPosition() : 0;
+ }
+
+ public IResource getResource() {
+ return resource;
+ }
+
+ public IMember getSourceMember() {
+ return type;
+ }
+
+ public IJavaElement getSourceElement() {
+ return SeamJavaComponentDeclaration.this.getSourceElement();
+ }
+ };
+ return reference;
+ }
+
private void lookUpForVariable(String importname, String name, Set<ISeamContextVariable> result) {
String qname = importname + "." + name;
Set<ISeamContextVariable> c = getSeamProject().getVariablesByName(qname);
12 years, 5 months
- 1
- 0
JBoss Tools SVN: r37500 - in trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal: ui/wizard/appimport and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2011-12-21 16:55:56 -0500 (Wed, 21 Dec 2011)
New Revision: 37500
Modified:
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/behaviour/ExpressPublishMethod.java
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/behaviour/ExpressServerUtils.java
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/appimport/ImportProjectWizardModel.java
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/appimport/ServerAdapterFactory.java
Log:
https://issues.jboss.org/browse/JBIDE-10542 - allow publishing to the destination chosen in the new wizard.
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/behaviour/ExpressPublishMethod.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/behaviour/ExpressPublishMethod.java 2011-12-21 19:28:55 UTC (rev 37499)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/behaviour/ExpressPublishMethod.java 2011-12-21 21:55:56 UTC (rev 37500)
@@ -102,11 +102,9 @@
return IServer.PUBLISH_STATE_NONE;
} else if( changed == 0 && requestPushApproval(module)) {
monitor.beginTask("Publishing " + p.getName(), 100);
-// TODO: use the following instead of the current:
-// EGitUtils.push("<remote name configured in AdapterWizardPageModel#getRemoteName>"
-// , EGitUtils.getRepository(p)
-// , new SubProgressMonitor(monitor, 100));
- EGitUtils.push(EGitUtils.getRepository(p), new SubProgressMonitor(monitor, 100));
+ String remoteName = behaviour.getServer().getAttribute(ExpressServerUtils.ATTRIBUTE_REMOTE_NAME,
+ ExpressServerUtils.ATTRIBUTE_REMOTE_NAME_DEFAULT);
+ EGitUtils.push(remoteName, EGitUtils.getRepository(p), new SubProgressMonitor(monitor, 100));
monitor.done();
return IServer.PUBLISH_STATE_NONE;
}
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/behaviour/ExpressServerUtils.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/behaviour/ExpressServerUtils.java 2011-12-21 19:28:55 UTC (rev 37499)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/behaviour/ExpressServerUtils.java 2011-12-21 21:55:56 UTC (rev 37500)
@@ -23,7 +23,6 @@
import org.jboss.ide.eclipse.as.core.util.IJBossToolingConstants;
import org.jboss.ide.eclipse.as.core.util.RuntimeUtils;
import org.jboss.ide.eclipse.as.core.util.ServerCreationUtils;
-import org.jboss.tools.openshift.express.internal.ui.OpenShiftUIActivator;
/**
* This class holds the attribute names whose values will be
@@ -41,6 +40,8 @@
public static final String ATTRIBUTE_DOMAIN = "org.jboss.tools.openshift.express.internal.core.behaviour.Domain";
public static final String ATTRIBUTE_USERNAME = "org.jboss.tools.openshift.express.internal.core.behaviour.Username";
public static final String ATTRIBUTE_PASSWORD = "org.jboss.tools.openshift.express.internal.core.behaviour.Password";
+ public static final String ATTRIBUTE_REMOTE_NAME = "org.jboss.tools.openshift.express.internal.core.behaviour.RemoteName";
+ public static final String ATTRIBUTE_REMOTE_NAME_DEFAULT = "origin";
/** the OpensHift Server Type as defined in the plugin.xml.*/
public static final String OPENSHIFT_SERVER_TYPE = "org.jboss.tools.openshift.express.openshift.server.type";
@@ -126,12 +127,12 @@
public static IServer createAS7OpenShiftServer(
String host, String username, String password,
String domain, String appName, String appId,
- String sourceOrBinary,
+ String sourceOrBinary, String remoteName,
String localRuntimeHomeDir) throws CoreException {
IServer server = createServerAndRuntime(IJBossToolingConstants.AS_70,
IJBossToolingConstants.SERVER_AS_70,
localRuntimeHomeDir, /* irrelevant */ "default");
- return fillServerWithOpenShiftDetails(server, host, username, password, domain, appName, appId, sourceOrBinary);
+ return fillServerWithOpenShiftDetails(server, host, username, password, domain, appName, appId, sourceOrBinary, remoteName);
}
/**
@@ -150,10 +151,10 @@
*/
public static IServer createAS7OpenShiftServer(
String host, String username, String password,
- String domain, String appName, String appId, String sourceOrBinary,
+ String domain, String appName, String appId, String sourceOrBinary, String remoteName,
IRuntime runtime) throws CoreException {
IServer server = createServer(runtime, IJBossToolingConstants.SERVER_AS_70);
- return fillServerWithOpenShiftDetails(server, host, username, password, domain, appName, appId, sourceOrBinary);
+ return fillServerWithOpenShiftDetails(server, host, username, password, domain, appName, appId, sourceOrBinary, remoteName);
}
/**
@@ -170,9 +171,9 @@
* @throws CoreException
*/
@SuppressWarnings("restriction")
- public static IServer fillServerWithOpenShiftDetails(IServer server,
- String host, String username, String password, String domain, String appName, String appId,
- String mode) throws CoreException {
+ public static IServer fillServerWithOpenShiftDetails(IServer server, String host,
+ String username, String password, String domain, String appName, String appId,
+ String mode, String remoteName) throws CoreException {
if( host.indexOf("://") != -1)
host = host.substring(host.indexOf("://") + 3);
if( host.endsWith("/"))
@@ -186,6 +187,7 @@
wc.setAttribute(ATTRIBUTE_APPLICATION_NAME, appName);
wc.setAttribute(ATTRIBUTE_APPLICATION_ID, appId);
wc.setAttribute(ATTRIBUTE_EXPRESS_MODE, mode);
+ wc.setAttribute(ATTRIBUTE_REMOTE_NAME, remoteName);
wc.setAutoPublishSetting(Server.AUTO_PUBLISH_DISABLE);
wc.setAttribute(IJBossToolingConstants.IGNORE_LAUNCH_COMMANDS, "true");
wc.setAttribute(IJBossToolingConstants.WEB_PORT, 80);
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/appimport/ImportProjectWizardModel.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/appimport/ImportProjectWizardModel.java 2011-12-21 19:28:55 UTC (rev 37499)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/appimport/ImportProjectWizardModel.java 2011-12-21 21:55:56 UTC (rev 37500)
@@ -114,7 +114,7 @@
throws OpenShiftException {
Assert.isTrue(importedProjects.size() > 0);
IProject project = importedProjects.get(0);
- new ServerAdapterFactory().create(project, getServerType(), getRuntime(), getMode(), getApplication(), getUser(), monitor);
+ new ServerAdapterFactory().create(project, this, monitor);
}
public File getRepositoryFile() {
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/appimport/ServerAdapterFactory.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/appimport/ServerAdapterFactory.java 2011-12-21 19:28:55 UTC (rev 37499)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/appimport/ServerAdapterFactory.java 2011-12-21 21:55:56 UTC (rev 37500)
@@ -47,9 +47,14 @@
public ServerAdapterFactory() {
}
+ public void create(IProject project, ImportProjectWizardModel model, IProgressMonitor monitor) throws OpenShiftException {
+ createServerAdapter(project, model.getServerType(), model.getRuntime(), model.getMode(),
+ model.getApplication(), model.getUser(), model.getRemoteName(), monitor);
+ }
+
public void create(IProject project, IServerType serverType, IRuntime runtime, String mode,
IApplication application, IUser user, IProgressMonitor monitor) throws OpenShiftException {
- createServerAdapter(project, serverType, runtime, mode, application, user, monitor);
+ createServerAdapter(project, serverType, runtime, mode, application, user, null, monitor);
}
/**
@@ -60,18 +65,18 @@
* @throws OpenShiftException
*/
protected void createServerAdapter(IProject project, IServerType serverType, IRuntime runtime, String mode,
- IApplication application, IUser user, IProgressMonitor monitor) throws OpenShiftException {
+ IApplication application, IUser user, String remoteName, IProgressMonitor monitor) throws OpenShiftException {
String name = project.getName();
monitor.subTask(NLS.bind("Creating server adapter for project {0}", name));
- createServerAdapter(Collections.singletonList(project), serverType, runtime, mode, application, user,
- monitor);
+ createServerAdapter(Collections.singletonList(project), serverType, runtime,
+ mode, application, user, remoteName, monitor);
}
protected void createServerAdapter(List<IProject> importedProjects, IServerType serverType,
- IRuntime runtime, String mode, IApplication application, IUser user, IProgressMonitor monitor) {
+ IRuntime runtime, String mode, IApplication application, IUser user, String remoteName, IProgressMonitor monitor) {
try {
renameWebContextRoot(importedProjects);
- IServer server = doCreateServerAdapter(serverType, runtime, mode, application, user);
+ IServer server = doCreateServerAdapter(serverType, runtime, mode, application, user, remoteName);
addModules(getModules(importedProjects), server, monitor);
} catch (CoreException ce) {
OpenShiftUIActivator.getDefault().getLog().log(ce.getStatus());
@@ -88,8 +93,8 @@
}
}
- private IServer doCreateServerAdapter(IServerType serverType, IRuntime rt, String mode, IApplication application,
- IUser user) throws CoreException,
+ private IServer doCreateServerAdapter(IServerType serverType, IRuntime rt, String mode,
+ IApplication application, IUser user, String remoteName) throws CoreException,
OpenShiftException {
Assert.isLegal(serverType != null);
Assert.isLegal(mode != null);
@@ -101,8 +106,8 @@
IServer server = ExpressServerUtils.createServer(rt, serverType, serverName);
ExpressServerUtils.fillServerWithOpenShiftDetails(server, application.getApplicationUrl(),
- user.getRhlogin(), user.getPassword(),
- user.getDomain().getNamespace(), application.getName(), application.getUUID(), mode);
+ user.getRhlogin(), user.getPassword(), user.getDomain().getNamespace(),
+ application.getName(), application.getUUID(), mode, remoteName);
return server;
}
12 years, 5 months
- 1
- 0
JBoss Tools SVN: r37499 - in trunk: openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2011-12-21 14:28:55 -0500 (Wed, 21 Dec 2011)
New Revision: 37499
Added:
trunk/common/plugins/org.jboss.tools.common.ui/src/org/jboss/tools/common/ui/DelegatingProgressMonitor.java
Modified:
trunk/common/plugins/org.jboss.tools.common.ui/src/org/jboss/tools/common/ui/WizardUtils.java
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ApplicationWizardModel.java
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/EmbedCartridgeWizardPage.java
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/EmbedCartridgeWizardPageModel.java
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/NewApplicationWizardPage.java
Log:
[JBIDE-10549] implemented reporting of subtask when creating an OpenShift application. other jobs are still not reporting.
Added: trunk/common/plugins/org.jboss.tools.common.ui/src/org/jboss/tools/common/ui/DelegatingProgressMonitor.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.ui/src/org/jboss/tools/common/ui/DelegatingProgressMonitor.java (rev 0)
+++ trunk/common/plugins/org.jboss.tools.common.ui/src/org/jboss/tools/common/ui/DelegatingProgressMonitor.java 2011-12-21 19:28:55 UTC (rev 37499)
@@ -0,0 +1,130 @@
+/*******************************************************************************
+ * Copyright (c) 2011 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.common.ui;
+
+import java.util.List;
+import java.util.concurrent.CopyOnWriteArrayList;
+
+import org.eclipse.core.runtime.IProgressMonitor;
+
+/**
+ * An IProgressMonitor that aggregates other monitors and delegates call to the monitors
+ * that were added to it.
+ *
+ * @author André Dietisheim
+ */
+public class DelegatingProgressMonitor implements IProgressMonitor {
+
+ List<IProgressMonitor> monitors = new CopyOnWriteArrayList<IProgressMonitor>();
+
+ public void add(IProgressMonitor monitor) {
+ monitors.add(monitor);
+ }
+
+ @Override
+ public void subTask(final String name) {
+ doForAllMonitors(new IMonitorOperation() {
+
+ @Override
+ public void doWithMonitor(IProgressMonitor monitor) {
+ monitor.subTask(name);
+ }
+ });
+ }
+
+ @Override
+ public void beginTask(final String name, final int totalWork) {
+ doForAllMonitors(new IMonitorOperation() {
+
+ @Override
+ public void doWithMonitor(IProgressMonitor monitor) {
+ monitor.beginTask(name, totalWork);
+ }
+ });
+ }
+
+ @Override
+ public void done() {
+ doForAllMonitors(new IMonitorOperation() {
+
+ @Override
+ public void doWithMonitor(IProgressMonitor monitor) {
+ monitor.done();
+ }
+ });
+ }
+
+ @Override
+ public void internalWorked(final double work) {
+ doForAllMonitors(new IMonitorOperation() {
+
+ @Override
+ public void doWithMonitor(IProgressMonitor monitor) {
+ monitor.internalWorked(work);
+ }
+ });
+
+ }
+
+ @Override
+ public boolean isCanceled() {
+ for (IProgressMonitor monitor : monitors) {
+ if (monitor.isCanceled()) {
+ return true;
+ }
+ }
+ return false;
+ }
+
+ @Override
+ public void setCanceled(final boolean value) {
+ doForAllMonitors(new IMonitorOperation() {
+
+ @Override
+ public void doWithMonitor(IProgressMonitor monitor) {
+ monitor.setCanceled(value);
+ }
+ });
+ }
+
+ @Override
+ public void setTaskName(final String name) {
+ doForAllMonitors(new IMonitorOperation() {
+
+ @Override
+ public void doWithMonitor(IProgressMonitor monitor) {
+ monitor.setTaskName(name);
+ }
+ });
+
+ }
+
+ @Override
+ public void worked(final int work) {
+ doForAllMonitors(new IMonitorOperation() {
+
+ @Override
+ public void doWithMonitor(IProgressMonitor monitor) {
+ monitor.worked(work);
+ }
+ });
+ }
+
+ private void doForAllMonitors(IMonitorOperation operation) {
+ for (IProgressMonitor monitor : monitors) {
+ operation.doWithMonitor(monitor);
+ }
+ }
+
+ private interface IMonitorOperation {
+ public void doWithMonitor(IProgressMonitor monitor);
+ }
+}
Property changes on: trunk/common/plugins/org.jboss.tools.common.ui/src/org/jboss/tools/common/ui/DelegatingProgressMonitor.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Modified: trunk/common/plugins/org.jboss.tools.common.ui/src/org/jboss/tools/common/ui/WizardUtils.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.ui/src/org/jboss/tools/common/ui/WizardUtils.java 2011-12-21 19:10:54 UTC (rev 37498)
+++ trunk/common/plugins/org.jboss.tools.common.ui/src/org/jboss/tools/common/ui/WizardUtils.java 2011-12-21 19:28:55 UTC (rev 37499)
@@ -49,17 +49,33 @@
*/
public static void runInWizard(final Job job, IWizardContainer container) throws InvocationTargetException,
InterruptedException {
+ runInWizard(job, null, container);
+ }
+
+ public static void runInWizard(final Job job, final DelegatingProgressMonitor delegatingMonitor, IWizardContainer container) throws InvocationTargetException,
+ InterruptedException {
container.run(true, false, new IRunnableWithProgress() {
@Override
public void run(IProgressMonitor monitor) throws InvocationTargetException, InterruptedException {
- monitor.beginTask(job.getName(), IProgressMonitor.UNKNOWN);
+ if (delegatingMonitor == null) {
+ monitor.beginTask(job.getName(), IProgressMonitor.UNKNOWN);
+ } else {
+ delegatingMonitor.add(monitor);
+ delegatingMonitor.beginTask(job.getName(), IProgressMonitor.UNKNOWN);
+ }
+
job.schedule();
job.join();
- monitor.done();
+
+ if (delegatingMonitor == null) {
+ monitor.done();
+ } else {
+ delegatingMonitor.done();
+ }
}
});
}
-
+
/**
* Runs the given job in the given wizard container.
* <p>
@@ -89,6 +105,14 @@
dbc.updateModels();
}
+ public static void runInWizard(final Job job, IWizardContainer container, DelegatingProgressMonitor monitor,
+ final DataBindingContext dbc)
+ throws InvocationTargetException, InterruptedException {
+ runInWizard(job, container);
+ dbc.updateTargets();
+ dbc.updateModels();
+ }
+
/**
* Flips to the next wizard page or finishes the current wizard.
*
@@ -106,7 +130,7 @@
}
}
}
-
+
public static int openWizardDialog(IWizard wizard, Shell shell) {
WizardDialog dialog = new WizardDialog(shell, wizard);
dialog.create();
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ApplicationWizardModel.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ApplicationWizardModel.java 2011-12-21 19:10:54 UTC (rev 37498)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ApplicationWizardModel.java 2011-12-21 19:28:55 UTC (rev 37499)
@@ -10,6 +10,7 @@
******************************************************************************/
package org.jboss.tools.openshift.express.internal.ui.wizard;
+import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.osgi.util.NLS;
import org.jboss.tools.common.ui.databinding.ObservableUIPojo;
import org.jboss.tools.openshift.express.internal.ui.messages.OpenShiftExpressUIMessages;
@@ -63,8 +64,8 @@
this.cartridge = cartridge;
}
- public void createApplication() throws OpenShiftException {
- IApplication application = createApplication(name, cartridge);
+ public void createApplication(IProgressMonitor monitor) throws OpenShiftException {
+ IApplication application = createApplication(name, cartridge, monitor);
setApplication(application);
}
@@ -76,9 +77,10 @@
return application;
}
- public IApplication createApplication(String name, ICartridge cartridge) throws OpenShiftException {
+ public IApplication createApplication(String name, ICartridge cartridge, IProgressMonitor monitor) throws OpenShiftException {
+ monitor.subTask("Creating application...");
IApplication application = getUser().createApplication(name, cartridge);
- waitForAccessible(application);
+ waitForAccessible(application, monitor);
return application;
}
@@ -86,7 +88,8 @@
return user.hasApplication(name);
}
- private void waitForAccessible(IApplication application) throws OpenShiftApplicationNotAvailableException, OpenShiftException {
+ private void waitForAccessible(IApplication application, IProgressMonitor monitor) throws OpenShiftApplicationNotAvailableException, OpenShiftException {
+ monitor.subTask("Waiting for application to become accessible...");
if (!application.waitForAccessible(APP_CREATION_TIMEOUT * 1000)) {
throw new OpenShiftApplicationNotAvailableException(NLS.bind(
OpenShiftExpressUIMessages.HOSTNAME_NOT_ANSWERING,
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/EmbedCartridgeWizardPage.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/EmbedCartridgeWizardPage.java 2011-12-21 19:10:54 UTC (rev 37498)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/EmbedCartridgeWizardPage.java 2011-12-21 19:28:55 UTC (rev 37499)
@@ -183,7 +183,7 @@
@Override
protected IStatus run(IProgressMonitor monitor) {
try {
- IApplication jenkinsApplication = model.createJenkinsApplication(name);
+ IApplication jenkinsApplication = model.createJenkinsApplication(name, monitor);
model.getSelectedEmbeddableCartridges().add(cartridge);
openLogDialog(jenkinsApplication);
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/EmbedCartridgeWizardPageModel.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/EmbedCartridgeWizardPageModel.java 2011-12-21 19:10:54 UTC (rev 37498)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/EmbedCartridgeWizardPageModel.java 2011-12-21 19:28:55 UTC (rev 37499)
@@ -18,6 +18,7 @@
import org.eclipse.core.databinding.observable.Diffs;
import org.eclipse.core.databinding.observable.list.ListDiff;
import org.eclipse.core.databinding.observable.list.ListDiffEntry;
+import org.eclipse.core.runtime.IProgressMonitor;
import org.jboss.tools.common.ui.databinding.ObservableUIPojo;
import org.jboss.tools.openshift.express.internal.ui.OpenShiftUIActivator;
@@ -93,8 +94,8 @@
return wizardModel.getApplication();
}
- public IApplication createJenkinsApplication(String name) throws OpenShiftException {
- return wizardModel.createApplication(name, ICartridge.JENKINS_14);
+ public IApplication createJenkinsApplication(String name, IProgressMonitor monitor) throws OpenShiftException {
+ return wizardModel.createApplication(name, ICartridge.JENKINS_14, monitor);
}
/**
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/NewApplicationWizardPage.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/NewApplicationWizardPage.java 2011-12-21 19:10:54 UTC (rev 37498)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/NewApplicationWizardPage.java 2011-12-21 19:28:55 UTC (rev 37499)
@@ -36,6 +36,7 @@
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Label;
import org.eclipse.swt.widgets.Text;
+import org.jboss.tools.common.ui.DelegatingProgressMonitor;
import org.jboss.tools.common.ui.WizardUtils;
import org.jboss.tools.openshift.express.internal.ui.OpenShiftUIActivator;
@@ -53,7 +54,8 @@
private ApplicationWizardModel wizardModel;
public NewApplicationWizardPage(ApplicationWizardModel wizardModel, IWizard wizard) {
- super("New OpenShift Express Application", "Select a name and an type for your new OpenShift Express application",
+ super("New OpenShift Express Application",
+ "Select a name and an type for your new OpenShift Express application",
"NewOpenShiftExpressApplication", wizard);
this.wizardModel = wizardModel;
this.model = new NewApplicationWizardPageModel(wizardModel);
@@ -165,27 +167,31 @@
public boolean createApplication() {
final ArrayBlockingQueue<Boolean> applicationCreated = new ArrayBlockingQueue<Boolean>(1);
+ final DelegatingProgressMonitor delegatingMonitor = new DelegatingProgressMonitor();
try {
- WizardUtils.runInWizard(new Job(NLS.bind("Creating application \"{0}\"...", wizardModel.getName())) {
+ WizardUtils.runInWizard(new Job(NLS.bind("Creating application \"{0}\"", wizardModel.getName())) {
@Override
protected IStatus run(IProgressMonitor monitor) {
+ delegatingMonitor.add(monitor);
try {
- wizardModel.createApplication();
+ wizardModel.createApplication(delegatingMonitor);
applicationCreated.offer(true);
return Status.OK_STATUS;
} catch (OpenShiftApplicationNotAvailableException e) {
applicationCreated.offer(false);
- return OpenShiftUIActivator.createErrorStatus(e.getMessage(), e,
- wizardModel.getName());
+ return OpenShiftUIActivator.createErrorStatus(
+ e.getMessage(), e, wizardModel.getName());
} catch (OpenShiftException e) {
applicationCreated.offer(false);
- return OpenShiftUIActivator.createErrorStatus("Could not create application \"{0}\"", (Throwable)e,
- wizardModel.getName());
+ return OpenShiftUIActivator.createErrorStatus(
+ "Could not create application \"{0}\"",
+ (Throwable) e, wizardModel.getName());
}
}
- }, getContainer());
+ }, delegatingMonitor, getContainer());
} catch (Exception e) {
+ e.printStackTrace();
// ignore
}
return applicationCreated.poll();
12 years, 5 months
- 1
- 0
JBoss Tools SVN: r37498 - trunk/tests/plugins/org.jboss.tools.tests.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2011-12-21 14:10:54 -0500 (Wed, 21 Dec 2011)
New Revision: 37498
Modified:
trunk/tests/plugins/org.jboss.tools.tests/plugin_customization.ini
Log:
central, usage data gathering and JBossTools usage are disabled for tests to save time on waiting for idle before running tests
Modified: trunk/tests/plugins/org.jboss.tools.tests/plugin_customization.ini
===================================================================
--- trunk/tests/plugins/org.jboss.tools.tests/plugin_customization.ini 2011-12-21 18:35:15 UTC (rev 37497)
+++ trunk/tests/plugins/org.jboss.tools.tests/plugin_customization.ini 2011-12-21 19:10:54 UTC (rev 37498)
@@ -5,7 +5,7 @@
org.eclipse.ui.ide/SWITCH_PERSPECTIVE_ON_PROJECT_CREATION=never
org.eclipse.ui.workbench/ENABLED_DECORATORS=org.eclipse.wst.server.ui.decorator\:false,org.eclipse.jdt.ui.override.decorator\:false,org.eclipse.jdt.ui.interface.decorator\:false,org.eclipse.jdt.ui.buildpath.decorator\:false,org.eclipse.pde.ui.binaryProjectDecorator\:false,org.eclipse.ui.LinkedResourceDecorator\:false,org.eclipse.ui.VirtualResourceDecorator\:false,org.eclipse.ui.ContentTypeDecorator\:false,org.eclipse.ui.ResourceFilterDecorator\:false,org.eclipse.wst.jsdt.ui.override.decorator\:false,org.eclipse.wst.server.ui.navigatorDecorator\:false,
-org.eclipse.ui.workbench/PLUGINS_NOT_ACTIVATED_ON_STARTUP=org.eclipse.equinox.p2.ui.sdk.scheduler;org.eclipse.update.scheduler;
+org.eclipse.ui.workbench/PLUGINS_NOT_ACTIVATED_ON_STARTUP=org.eclipse.epp.usagedata.gathering;org.eclipse.epp.usagedata.recording;org.jboss.tools.usage;org.eclipse.equinox.p2.ui.sdk.scheduler;org.eclipse.update.scheduler;org.jboss.tools.central;
org.jboss.tools.usage/ask_user_for_usage_report_preference=false
org.jboss.tools.usage/allow_usage_report_preference=false
\ No newline at end of file
12 years, 5 months
- 1
- 0
JBoss Tools SVN: r37497 - in trunk: jsf/tests/org.jboss.tools.jsf.vpe.facelets.test/resources/faceletsTest/WebContent/pages/JBIDE/3416 and 16 other directories.
by jbosstools-commits＠lists.jboss.org
Author: yradtsevich
Date: 2011-12-21 13:35:15 -0500 (Wed, 21 Dec 2011)
New Revision: 37497
Modified:
trunk/jsf/tests/org.jboss.tools.jsf.vpe.ajax4jsf.test/resources/ajax4jsfTests/WebContent/pages/components/include.xhtml.xml
trunk/jsf/tests/org.jboss.tools.jsf.vpe.facelets.test/resources/faceletsTest/WebContent/pages/JBIDE/3416/jbide3416.xhtml.xml
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/customFaceletsTestProject/WebContent/pages/incorrectCustomTags.xhtml.xml
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/pages/JBIDE/5015/login.xhtml.xml
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/pages/JBIDE/5352/jbide5352.xhtml.xml
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/pages/JBIDE/5352/jsf-core-as-default-tags.xhtml.xml
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/pages/JBIDE/5908/welcome.xhtml.xml
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/pages/JBIDE/9753/welcome.xhtml.xml
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/pages/components/head2.xhtml.xml
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/3144/test.xhtml.xml
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/4710/iceOutputText.xhtml.xml
trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/dataTable&Spacer&DataScroller.xhtml.xml
trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/inplaceInput.xhtml.xml
trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/insert.xhtml.xml
trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/progressBar.xhtml.xml
trunk/jsf/tests/org.jboss.tools.jsf.vpe.seam.test/resources/SeamTest/WebContent/pages/components/formattedText.xhtml.xml
trunk/jsf/tests/org.jboss.tools.jsf.vpe.seam.test/resources/SeamTest/WebContent/pages/components/remote.xhtml.xml
trunk/vpe/plugins/org.jboss.tools.vpe.html/templates/vpe-templates-html.xml
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpePseudoContentCreator.java
trunk/vpe/plugins/org.jboss.tools.vpe/ve/EditorOverride.css
trunk/vpe/tests/org.jboss.tools.vpe.html.test/resources/htmlTest/WebContent/pages/components/core/head.html.xml
trunk/vpe/tests/org.jboss.tools.vpe.html.test/resources/htmlTest/WebContent/pages/components/core/html.html.xml
trunk/vpe/tests/org.jboss.tools.vpe.html.test/resources/htmlTest/WebContent/pages/components/other/basefont.html.xml
trunk/vpe/tests/org.jboss.tools.vpe.html.test/resources/htmlTest/WebContent/pages/components/table/table.html.xml
Log:
https://issues.jboss.org/browse/JBIDE-10462 : br vpe:pseudo-element
Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.ajax4jsf.test/resources/ajax4jsfTests/WebContent/pages/components/include.xhtml.xml
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.ajax4jsf.test/resources/ajax4jsfTests/WebContent/pages/components/include.xhtml.xml 2011-12-21 17:12:12 UTC (rev 37496)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.ajax4jsf.test/resources/ajax4jsfTests/WebContent/pages/components/include.xhtml.xml 2011-12-21 18:35:15 UTC (rev 37497)
@@ -4,8 +4,7 @@
STYLE="margin: 3px 0pt; padding: 0pt 5px; background-color: rgb(236, 243, 255); cursor: pointer; font-style: italic; color: rgb(0, 81, 221);"
VPE:INCLUDE-ELEMENT="yes">
/pages/include/first.xhtml
- <BR VPE:PSEUDO-ELEMENT="yes"
- STYLE="font-style: italic; color: green; -moz-user-modify: read-only;"/>
+ <BR VPE:PSEUDO-ELEMENT="yes"/>
</DIV>
</test>
</tests>
\ No newline at end of file
Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.facelets.test/resources/faceletsTest/WebContent/pages/JBIDE/3416/jbide3416.xhtml.xml
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.facelets.test/resources/faceletsTest/WebContent/pages/JBIDE/3416/jbide3416.xhtml.xml 2011-12-21 17:12:12 UTC (rev 37496)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.facelets.test/resources/faceletsTest/WebContent/pages/JBIDE/3416/jbide3416.xhtml.xml 2011-12-21 18:35:15 UTC (rev 37497)
@@ -33,8 +33,7 @@
<TR>
<TD>
<DIV CLASS="pageBody" STYLE="-moz-user-modify: read-only;">
- <BR VPE:PSEUDO-ELEMENT="yes"
- STYLE="font-style: italic; color: green; -moz-user-modify: read-only;" />
+ <BR VPE:PSEUDO-ELEMENT="yes"/>
</DIV>
</TD>
Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/customFaceletsTestProject/WebContent/pages/incorrectCustomTags.xhtml.xml
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/customFaceletsTestProject/WebContent/pages/incorrectCustomTags.xhtml.xml 2011-12-21 17:12:12 UTC (rev 37496)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/customFaceletsTestProject/WebContent/pages/incorrectCustomTags.xhtml.xml 2011-12-21 18:35:15 UTC (rev 37497)
@@ -10,17 +10,17 @@
<DIV STYLE="border: 1px solid green; -moz-user-modify: read-only;">
<DIV CLASS="__any__tag__caption" STYLE="">
mo:paginator
-</DIV><BR VPE:PSEUDO-ELEMENT="yes" STYLE="font-style: italic; color: green; -moz-user-modify: read-only;"/>
+</DIV><BR VPE:PSEUDO-ELEMENT="yes"/>
</DIV>
<DIV STYLE="border: 1px solid green; -moz-user-modify: read-only;">
<DIV CLASS="__any__tag__caption" STYLE="">
mo:test
-</DIV><BR VPE:PSEUDO-ELEMENT="yes" STYLE="font-style: italic; color: green; -moz-user-modify: read-only;"/>
+</DIV><BR VPE:PSEUDO-ELEMENT="yes"/>
</DIV>
<DIV VPE:INCLUDE-ELEMENT="yes">
-ma:test1<BR VPE:PSEUDO-ELEMENT="yes" STYLE="font-style: italic; color: green; -moz-user-modify: read-only;"/>
+ma:test1<BR VPE:PSEUDO-ELEMENT="yes"/>
</DIV>
</DIV>
Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/pages/JBIDE/5015/login.xhtml.xml
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/pages/JBIDE/5015/login.xhtml.xml 2011-12-21 17:12:12 UTC (rev 37496)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/pages/JBIDE/5015/login.xhtml.xml 2011-12-21 18:35:15 UTC (rev 37497)
@@ -4,7 +4,7 @@
<DIV VPE:INCLUDE-ELEMENT="yes" STYLE="-moz-user-modify: read-only;">
<DIV STYLE="-moz-user-modify: read-only;">
<DIV STYLE="display: none; -moz-user-modify: read-only;">
-<BR VPE:PSEUDO-ELEMENT="yes" STYLE="font-style: italic; color: green; -moz-user-modify: read-only;"/>
+<BR VPE:PSEUDO-ELEMENT="yes"/>
</DIV>
<DIV STYLE="-moz-user-modify: read-only;">
<DIV VPE:INCLUDE-ELEMENT="yes" STYLE="-moz-user-modify: read-only;">
Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/pages/JBIDE/5352/jbide5352.xhtml.xml
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/pages/JBIDE/5352/jbide5352.xhtml.xml 2011-12-21 17:12:12 UTC (rev 37496)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/pages/JBIDE/5352/jbide5352.xhtml.xml 2011-12-21 18:35:15 UTC (rev 37497)
@@ -11,7 +11,7 @@
<DIV STYLE="border: 1px solid green; -moz-user-modify: read-only;">
<DIV CLASS="__any__tag__caption" STYLE="">
h1
-</DIV><BR VPE:PSEUDO-ELEMENT="yes" STYLE="font-style: italic; color: green; -moz-user-modify: read-only;"/>
+</DIV><BR VPE:PSEUDO-ELEMENT="yes"/>
</DIV>
<INPUT VALUE="Test"/>
Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/pages/JBIDE/5352/jsf-core-as-default-tags.xhtml.xml
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/pages/JBIDE/5352/jsf-core-as-default-tags.xhtml.xml 2011-12-21 17:12:12 UTC (rev 37496)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/pages/JBIDE/5352/jsf-core-as-default-tags.xhtml.xml 2011-12-21 18:35:15 UTC (rev 37497)
@@ -10,7 +10,7 @@
<DIV STYLE="border: 1px solid green; -moz-user-modify: read-only;">
<DIV CLASS="__any__tag__caption" STYLE="">
h1
-</DIV><BR VPE:PSEUDO-ELEMENT="yes" STYLE="font-style: italic; color: green; -moz-user-modify: read-only;"/>
+</DIV><BR VPE:PSEUDO-ELEMENT="yes"/>
</DIV>
<INPUT VALUE="Test"/>
Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/pages/JBIDE/5908/welcome.xhtml.xml
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/pages/JBIDE/5908/welcome.xhtml.xml 2011-12-21 17:12:12 UTC (rev 37496)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/pages/JBIDE/5908/welcome.xhtml.xml 2011-12-21 18:35:15 UTC (rev 37497)
@@ -43,8 +43,7 @@
<TR STYLE="-moz-user-modify: read-only;">
<TD CLASS="menu_col rich-page-sidebar #{cc.attrs.sidebarClass}" STYLE="-moz-user-modify: read-only;">
<DIV CLASS="menu_width spacer" STYLE="-moz-user-modify: read-only;">
- <BR VPE:PSEUDO-ELEMENT="yes"
- STYLE="font-style: italic; color: green; -moz-user-modify: read-only;" />
+ <BR VPE:PSEUDO-ELEMENT="yes"/>
</DIV>
<SPAN STYLE="-moz-user-modify: read-only;">
Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/pages/JBIDE/9753/welcome.xhtml.xml
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/pages/JBIDE/9753/welcome.xhtml.xml 2011-12-21 17:12:12 UTC (rev 37496)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/pages/JBIDE/9753/welcome.xhtml.xml 2011-12-21 18:35:15 UTC (rev 37497)
@@ -43,8 +43,7 @@
<TR STYLE="-moz-user-modify: read-only;">
<TD CLASS="menu_col rich-page-sidebar #{cc.attrs.sidebarClass}" STYLE="-moz-user-modify: read-only;">
<DIV CLASS="menu_width spacer" STYLE="-moz-user-modify: read-only;">
- <BR VPE:PSEUDO-ELEMENT="yes"
- STYLE="font-style: italic; color: green; -moz-user-modify: read-only;" />
+ <BR VPE:PSEUDO-ELEMENT="yes"/>
</DIV>
<SPAN STYLE="-moz-user-modify: read-only;">
Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/pages/components/head2.xhtml.xml
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/pages/components/head2.xhtml.xml 2011-12-21 17:12:12 UTC (rev 37496)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/pages/components/head2.xhtml.xml 2011-12-21 18:35:15 UTC (rev 37497)
@@ -1,7 +1,7 @@
<tests>
<test id="head1">
<DIV STYLE="display: none; -moz-user-modify: read-only;">
- <BR VPE:PSEUDO-ELEMENT="yes" STYLE="font-style: italic; color: green; -moz-user-modify: read-only;"/>
+ <BR VPE:PSEUDO-ELEMENT="yes"/>
</DIV>
</test>
</tests>
\ No newline at end of file
Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/3144/test.xhtml.xml
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/3144/test.xhtml.xml 2011-12-21 17:12:12 UTC (rev 37496)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/3144/test.xhtml.xml 2011-12-21 18:35:15 UTC (rev 37497)
@@ -13,8 +13,7 @@
</SPAN>
<DIV
STYLE="width: 109px; height: 106px; background-color: green; -moz-user-modify: read-write;">
- <BR VPE:PSEUDO-ELEMENT="yes"
- STYLE="font-style: italic; color: green; -moz-user-modify: read-only;" />
+ <BR VPE:PSEUDO-ELEMENT="yes"/>
</DIV>
<SPAN CLASS="vpe-text">
Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/4710/iceOutputText.xhtml.xml
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/4710/iceOutputText.xhtml.xml 2011-12-21 17:12:12 UTC (rev 37496)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/4710/iceOutputText.xhtml.xml 2011-12-21 18:35:15 UTC (rev 37497)
@@ -1,7 +1,7 @@
<tests>
<test id="iceFacesTextProcessing">
<SPAN STYLE="color: blue;">
-Ice Test Output Text<BR VPE:PSEUDO-ELEMENT="yes" STYLE="font-style: italic; color: green; -moz-user-modify: read-only;"/>
+Ice Test Output Text<BR VPE:PSEUDO-ELEMENT="yes"/>
</SPAN>
</test>
</tests>
\ No newline at end of file
Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/dataTable&Spacer&DataScroller.xhtml.xml
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/dataTable&Spacer&DataScroller.xhtml.xml 2011-12-21 17:12:12 UTC (rev 37496)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/dataTable&Spacer&DataScroller.xhtml.xml 2011-12-21 18:35:15 UTC (rev 37497)
@@ -124,8 +124,7 @@
<TD CLASS="dr-table-cell rich-table-cell col3">
<SPAN>
Validation message
- <BR VPE:PSEUDO-ELEMENT="yes"
- STYLE="font-style: italic; color: green; -moz-user-modify: read-only;" />
+ <BR VPE:PSEUDO-ELEMENT="yes"/>
</SPAN>
<BR STYLE="-moz-user-modify: read-write;" />
Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/inplaceInput.xhtml.xml
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/inplaceInput.xhtml.xml 2011-12-21 17:12:12 UTC (rev 37496)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/inplaceInput.xhtml.xml 2011-12-21 18:35:15 UTC (rev 37497)
@@ -8,8 +8,7 @@
STYLE="display: inline;">
click to enter your name
</SPAN>
- <BR VPE:PSEUDO-ELEMENT="yes"
- STYLE="font-style: italic; color: green; -moz-user-modify: read-only;" />
+ <BR VPE:PSEUDO-ELEMENT="yes"/>
</SPAN>
</test>
@@ -31,8 +30,7 @@
CLASS="rich-inplace rich-inplace-view btn" STYLE="display: inline;">
click to enter your NamE
</SPAN>
- <BR VPE:PSEUDO-ELEMENT="yes"
- STYLE="font-style: italic; color: green; -moz-user-modify: read-only;" />
+ <BR VPE:PSEUDO-ELEMENT="yes"/>
</SPAN>
</TD>
</TR>
@@ -50,8 +48,7 @@
CLASS="rich-inplace rich-inplace-view evenRow" STYLE="display: inline;">
click to enter your email
</SPAN>
- <BR VPE:PSEUDO-ELEMENT="yes"
- STYLE="font-style: italic; color: green; -moz-user-modify: read-only;" />
+ <BR VPE:PSEUDO-ELEMENT="yes"/>
</SPAN>
</TD>
</TR>
Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/insert.xhtml.xml
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/insert.xhtml.xml 2011-12-21 17:12:12 UTC (rev 37496)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/insert.xhtml.xml 2011-12-21 18:35:15 UTC (rev 37497)
@@ -2,8 +2,7 @@
<test id="insert">
<DIV STYLE="color: red; font-weight: bold;">
Resource reading error.
- <BR VPE:PSEUDO-ELEMENT="yes"
- STYLE="font-style: italic; color: green; -moz-user-modify: read-only;" />
+ <BR VPE:PSEUDO-ELEMENT="yes"/>
</DIV>
</test>
</tests>
\ No newline at end of file
Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/progressBar.xhtml.xml
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/progressBar.xhtml.xml 2011-12-21 17:12:12 UTC (rev 37496)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/progressBar.xhtml.xml 2011-12-21 18:35:15 UTC (rev 37497)
@@ -32,15 +32,13 @@
</DIV>
<SPAN>
<SPAN STYLE="display: none; -moz-user-modify: read-only;">
- <BR VPE:PSEUDO-ELEMENT="yes"
- STYLE="font-style: italic; color: green; -moz-user-modify: read-only;" />
+ <BR VPE:PSEUDO-ELEMENT="yes"/>
</SPAN>
</SPAN>
<SPAN>
<SPAN STYLE="display: none; -moz-user-modify: read-only;">
- <BR VPE:PSEUDO-ELEMENT="yes"
- STYLE="font-style: italic; color: green; -moz-user-modify: read-only;" />
+ <BR VPE:PSEUDO-ELEMENT="yes"/>
</SPAN>
</SPAN>
Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.seam.test/resources/SeamTest/WebContent/pages/components/formattedText.xhtml.xml
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.seam.test/resources/SeamTest/WebContent/pages/components/formattedText.xhtml.xml 2011-12-21 17:12:12 UTC (rev 37496)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.seam.test/resources/SeamTest/WebContent/pages/components/formattedText.xhtml.xml 2011-12-21 18:35:15 UTC (rev 37497)
@@ -6,8 +6,7 @@
{blog.text}
</LI>
</OL>
- <BR VPE:PSEUDO-ELEMENT="yes"
- STYLE="font-style: italic; color: green; -moz-user-modify: read-only;" />
+ <BR VPE:PSEUDO-ELEMENT="yes"/>
</SPAN>
</test>
<test id="id2">
@@ -43,8 +42,7 @@
</U>
.
</P>
- <BR VPE:PSEUDO-ELEMENT="yes"
- STYLE="font-style: italic; color: green; -moz-user-modify: read-only;" />
+ <BR VPE:PSEUDO-ELEMENT="yes"/>
</SPAN>
</test>
</tests>
\ No newline at end of file
Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.seam.test/resources/SeamTest/WebContent/pages/components/remote.xhtml.xml
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.seam.test/resources/SeamTest/WebContent/pages/components/remote.xhtml.xml 2011-12-21 17:12:12 UTC (rev 37496)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.seam.test/resources/SeamTest/WebContent/pages/components/remote.xhtml.xml 2011-12-21 18:35:15 UTC (rev 37497)
@@ -1,8 +1,7 @@
<tests>
<test id="id1">
<SPAN CLASS="vpe-text" STYLE="-moz-user-modify: read-write;">
- <BR VPE:PSEUDO-ELEMENT="yes"
- STYLE="font-style: italic; color: green; -moz-user-modify: read-only;" />
+ <BR VPE:PSEUDO-ELEMENT="yes"/>
</SPAN>
</test>
<test id="id2">
Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpePseudoContentCreator.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpePseudoContentCreator.java 2011-12-21 17:12:12 UTC (rev 37496)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpePseudoContentCreator.java 2011-12-21 18:35:15 UTC (rev 37497)
@@ -26,7 +26,6 @@
public static void setPseudoAttribute(nsIDOMElement visualPseudoElement) {
visualPseudoElement.setAttribute(PSEUDO_CONTENT_ATTR, "yes"); //$NON-NLS-1$
- visualPseudoElement.setAttribute("style", "font-style:italic; color:green"); //$NON-NLS-1$ //$NON-NLS-2$
VpeHtmlTemplate.makeModify(visualPseudoElement, false);
}
Modified: trunk/vpe/plugins/org.jboss.tools.vpe/ve/EditorOverride.css
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/ve/EditorOverride.css 2011-12-21 17:12:12 UTC (rev 37496)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/ve/EditorOverride.css 2011-12-21 18:35:15 UTC (rev 37497)
@@ -451,3 +451,8 @@
font-size-adjust :inherit !important;
opacity :inherit !important;
}
+
+[vpe\:pseudo-element='yes'] {
+ font-style:italic;
+ color:green;
+}
Modified: trunk/vpe/plugins/org.jboss.tools.vpe.html/templates/vpe-templates-html.xml
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe.html/templates/vpe-templates-html.xml 2011-12-21 17:12:12 UTC (rev 37496)
+++ trunk/vpe/plugins/org.jboss.tools.vpe.html/templates/vpe-templates-html.xml 2011-12-21 18:35:15 UTC (rev 37497)
@@ -8,7 +8,6 @@
<vpe:dnd>
<vpe:drag start-enable="yes" />
<vpe:drop container="yes">
- <vpe:container-child tag-name="#text" />
</vpe:drop>
</vpe:dnd>
<vpe:textFormatting use-default-formats="yes">
Modified: trunk/vpe/tests/org.jboss.tools.vpe.html.test/resources/htmlTest/WebContent/pages/components/core/head.html.xml
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.html.test/resources/htmlTest/WebContent/pages/components/core/head.html.xml 2011-12-21 17:12:12 UTC (rev 37496)
+++ trunk/vpe/tests/org.jboss.tools.vpe.html.test/resources/htmlTest/WebContent/pages/components/core/head.html.xml 2011-12-21 18:35:15 UTC (rev 37497)
@@ -1,6 +1,6 @@
<tests>
<test id="head">
- <DIV STYLE="display: none; -moz-user-modify: read-only;"><BR VPE:PSEUDO-ELEMENT="yes" STYLE="font-style: italic; color: green; -moz-user-modify: read-only;"/>
+ <DIV STYLE="display: none; -moz-user-modify: read-only;"><BR VPE:PSEUDO-ELEMENT="yes"/>
</DIV>
</test>
Modified: trunk/vpe/tests/org.jboss.tools.vpe.html.test/resources/htmlTest/WebContent/pages/components/core/html.html.xml
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.html.test/resources/htmlTest/WebContent/pages/components/core/html.html.xml 2011-12-21 17:12:12 UTC (rev 37496)
+++ trunk/vpe/tests/org.jboss.tools.vpe.html.test/resources/htmlTest/WebContent/pages/components/core/html.html.xml 2011-12-21 18:35:15 UTC (rev 37497)
@@ -2,8 +2,7 @@
<test id="html">
<DIV>
<DIV STYLE="display: none; -moz-user-modify: read-only;">
- <BR VPE:PSEUDO-ELEMENT="yes"
- STYLE="font-style: italic; color: green; -moz-user-modify: read-only;" />
+ <BR VPE:PSEUDO-ELEMENT="yes"/>
</DIV>
<DIV>
Modified: trunk/vpe/tests/org.jboss.tools.vpe.html.test/resources/htmlTest/WebContent/pages/components/other/basefont.html.xml
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.html.test/resources/htmlTest/WebContent/pages/components/other/basefont.html.xml 2011-12-21 17:12:12 UTC (rev 37496)
+++ trunk/vpe/tests/org.jboss.tools.vpe.html.test/resources/htmlTest/WebContent/pages/components/other/basefont.html.xml 2011-12-21 18:35:15 UTC (rev 37497)
@@ -2,7 +2,6 @@
<test id="basefont">
<BASEFONT ID="basefont" FACE="Arial, Helvetica, sans-serif"
SIZE="4" COLOR="red" STYLE="-moz-user-modify: read-write;" />
- <BR VPE:PSEUDO-ELEMENT="yes"
- STYLE="font-style: italic; color: green; -moz-user-modify: read-only;" />
+ <BR VPE:PSEUDO-ELEMENT="yes"/>
</test>
</tests>
\ No newline at end of file
Modified: trunk/vpe/tests/org.jboss.tools.vpe.html.test/resources/htmlTest/WebContent/pages/components/table/table.html.xml
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.html.test/resources/htmlTest/WebContent/pages/components/table/table.html.xml 2011-12-21 17:12:12 UTC (rev 37496)
+++ trunk/vpe/tests/org.jboss.tools.vpe.html.test/resources/htmlTest/WebContent/pages/components/table/table.html.xml 2011-12-21 18:35:15 UTC (rev 37497)
@@ -3,8 +3,7 @@
<TABLE CELLSPACING="0" CELLPADDING="5" BORDER="0" WIDTH="400"
ID="table" STYLE="-moz-user-modify: read-write;">
<COLGROUP WIDTH="150" STYLE="-moz-user-modify: read-write;">
- <BR VPE:PSEUDO-ELEMENT="yes"
- STYLE="font-style: italic; color: green; -moz-user-modify: read-only;" />
+ <BR VPE:PSEUDO-ELEMENT="yes"/>
</COLGROUP>
<COLGROUP ALIGN="center" SPAN="9" WIDTH="50"
12 years, 5 months
- 1
- 0
JBoss Tools SVN: r37496 - in trunk/documentation/whatsnew/vpe: images and 8 other directories.
by jbosstools-commits＠lists.jboss.org
Author: yradtsevich
Date: 2011-12-21 12:12:12 -0500 (Wed, 21 Dec 2011)
New Revision: 37496
Modified:
trunk/documentation/whatsnew/vpe/images/3.0.0.CR1/jsf2-composition.png
trunk/documentation/whatsnew/vpe/images/3.0.0.CR1/vpe-seam-mail.png
trunk/documentation/whatsnew/vpe/images/3.0.0.CR1/vpe-seam-pdf.png
trunk/documentation/whatsnew/vpe/images/3.0.0.CR1/vpe-selection-bar.png
trunk/documentation/whatsnew/vpe/images/3.0.0.CR1/vpe-toolbar-view.png
trunk/documentation/whatsnew/vpe/images/3.0.0.CR1/vpe-zoom-possibility.png
trunk/documentation/whatsnew/vpe/images/3.2.0.M1/cssSelector.png
trunk/documentation/whatsnew/vpe/images/3.2.0.M1/externalize1.png
trunk/documentation/whatsnew/vpe/images/3.2.0.M1/externalize11.png
trunk/documentation/whatsnew/vpe/images/3.2.0.M1/externalize2.png
trunk/documentation/whatsnew/vpe/images/3.2.0.M1/jbpmTemplates.png
trunk/documentation/whatsnew/vpe/images/3.2.0.M1/jsf2-create-attribute.png
trunk/documentation/whatsnew/vpe/images/3.2.0.M1/jsf2-create-component.png
trunk/documentation/whatsnew/vpe/images/3.2.0.M1/jsf2-create-folder.png
trunk/documentation/whatsnew/vpe/images/3.2.0.M1/storedTags1.png
trunk/documentation/whatsnew/vpe/images/3.2.0.M1/storedTags2.png
trunk/documentation/whatsnew/vpe/images/3.2.0.M1/storedTags3.png
trunk/documentation/whatsnew/vpe/images/3.2.0.M1/vpe-drag-and-drop.png
trunk/documentation/whatsnew/vpe/images/3.2.0.M1/xhtml-templates.png
trunk/documentation/whatsnew/vpe/images/3.2.0.M2/Import-Export.png
trunk/documentation/whatsnew/vpe/images/3.2.0.M2/docbook-editor.png
trunk/documentation/whatsnew/vpe/images/3.2.0.M2/size-captition.png
trunk/documentation/whatsnew/vpe/images/3.2.0.M2/spring-templates.png
trunk/documentation/whatsnew/vpe/images/3.3.0.M1/vpe-multiple-selection.png
trunk/documentation/whatsnew/vpe/images/3.3.0.M2/createJSF2composite_1.png
trunk/documentation/whatsnew/vpe/images/3.3.0.M2/createJSF2composite_2.png
trunk/documentation/whatsnew/vpe/images/3.3.0.M3/8719.png
trunk/documentation/whatsnew/vpe/images/3.3.0.M3/9203.png
trunk/documentation/whatsnew/vpe/images/3.3.0.M4/8950.png
trunk/documentation/whatsnew/vpe/images/3.3.0.M4/9674.png
trunk/documentation/whatsnew/vpe/images/3.3.0.M5/10020.png
trunk/documentation/whatsnew/vpe/images/3.3.0.M5/9539.png
trunk/documentation/whatsnew/vpe/images/context-menu.png
trunk/documentation/whatsnew/vpe/images/css-dialog-calling.png
trunk/documentation/whatsnew/vpe/images/css-editor-dialog.png
trunk/documentation/whatsnew/vpe/images/el-configuration.png
trunk/documentation/whatsnew/vpe/images/jsfcca.png
trunk/documentation/whatsnew/vpe/images/preview-tab.png
trunk/documentation/whatsnew/vpe/images/richfaces_3_1_0.png
trunk/documentation/whatsnew/vpe/images/selection-bar.png
trunk/documentation/whatsnew/vpe/images/vpe-custom-tags-rendering.png
trunk/documentation/whatsnew/vpe/images/vpe-horizontal-split.png
trunk/documentation/whatsnew/vpe/images/vpe-vertical-split.png
trunk/documentation/whatsnew/vpe/vpe-news-3.3.0.M1.html
trunk/documentation/whatsnew/vpe/vpe-news-3.3.0.M2.html
trunk/documentation/whatsnew/vpe/vpe-news-3.3.0.M3.html
trunk/documentation/whatsnew/vpe/vpe-news-3.3.0.M4.html
trunk/documentation/whatsnew/vpe/vpe-news-3.3.0.M5.html
Log:
Set proper MIME types for VPE N&Ns
Property changes on: trunk/documentation/whatsnew/vpe/images/3.0.0.CR1/jsf2-composition.png
___________________________________________________________________
Modified: svn:mime-type
- application/octet-stream
+ image/png
Property changes on: trunk/documentation/whatsnew/vpe/images/3.0.0.CR1/vpe-seam-mail.png
___________________________________________________________________
Modified: svn:mime-type
- application/octet-stream
+ image/png
Property changes on: trunk/documentation/whatsnew/vpe/images/3.0.0.CR1/vpe-seam-pdf.png
___________________________________________________________________
Modified: svn:mime-type
- application/octet-stream
+ image/png
Property changes on: trunk/documentation/whatsnew/vpe/images/3.0.0.CR1/vpe-selection-bar.png
___________________________________________________________________
Modified: svn:mime-type
- application/octet-stream
+ image/png
Property changes on: trunk/documentation/whatsnew/vpe/images/3.0.0.CR1/vpe-toolbar-view.png
___________________________________________________________________
Modified: svn:mime-type
- application/octet-stream
+ image/png
Property changes on: trunk/documentation/whatsnew/vpe/images/3.0.0.CR1/vpe-zoom-possibility.png
___________________________________________________________________
Modified: svn:mime-type
- application/octet-stream
+ image/png
Property changes on: trunk/documentation/whatsnew/vpe/images/3.2.0.M1/cssSelector.png
___________________________________________________________________
Modified: svn:mime-type
- application/octet-stream
+ image/png
Property changes on: trunk/documentation/whatsnew/vpe/images/3.2.0.M1/externalize1.png
___________________________________________________________________
Modified: svn:mime-type
- application/octet-stream
+ image/png
Property changes on: trunk/documentation/whatsnew/vpe/images/3.2.0.M1/externalize11.png
___________________________________________________________________
Modified: svn:mime-type
- application/octet-stream
+ image/png
Property changes on: trunk/documentation/whatsnew/vpe/images/3.2.0.M1/externalize2.png
___________________________________________________________________
Modified: svn:mime-type
- application/octet-stream
+ image/png
Property changes on: trunk/documentation/whatsnew/vpe/images/3.2.0.M1/jbpmTemplates.png
___________________________________________________________________
Modified: svn:mime-type
- application/octet-stream
+ image/png
Property changes on: trunk/documentation/whatsnew/vpe/images/3.2.0.M1/jsf2-create-attribute.png
___________________________________________________________________
Modified: svn:mime-type
- application/octet-stream
+ image/png
Property changes on: trunk/documentation/whatsnew/vpe/images/3.2.0.M1/jsf2-create-component.png
___________________________________________________________________
Modified: svn:mime-type
- application/octet-stream
+ image/png
Property changes on: trunk/documentation/whatsnew/vpe/images/3.2.0.M1/jsf2-create-folder.png
___________________________________________________________________
Modified: svn:mime-type
- application/octet-stream
+ image/png
Property changes on: trunk/documentation/whatsnew/vpe/images/3.2.0.M1/storedTags1.png
___________________________________________________________________
Modified: svn:mime-type
- application/octet-stream
+ image/png
Property changes on: trunk/documentation/whatsnew/vpe/images/3.2.0.M1/storedTags2.png
___________________________________________________________________
Modified: svn:mime-type
- application/octet-stream
+ image/png
Property changes on: trunk/documentation/whatsnew/vpe/images/3.2.0.M1/storedTags3.png
___________________________________________________________________
Modified: svn:mime-type
- application/octet-stream
+ image/png
Property changes on: trunk/documentation/whatsnew/vpe/images/3.2.0.M1/vpe-drag-and-drop.png
___________________________________________________________________
Modified: svn:mime-type
- application/octet-stream
+ image/png
Property changes on: trunk/documentation/whatsnew/vpe/images/3.2.0.M1/xhtml-templates.png
___________________________________________________________________
Modified: svn:mime-type
- application/octet-stream
+ image/png
Property changes on: trunk/documentation/whatsnew/vpe/images/3.2.0.M2/Import-Export.png
___________________________________________________________________
Modified: svn:mime-type
- application/octet-stream
+ image/png
Property changes on: trunk/documentation/whatsnew/vpe/images/3.2.0.M2/docbook-editor.png
___________________________________________________________________
Modified: svn:mime-type
- application/octet-stream
+ image/png
Property changes on: trunk/documentation/whatsnew/vpe/images/3.2.0.M2/size-captition.png
___________________________________________________________________
Modified: svn:mime-type
- application/octet-stream
+ image/png
Property changes on: trunk/documentation/whatsnew/vpe/images/3.2.0.M2/spring-templates.png
___________________________________________________________________
Modified: svn:mime-type
- application/octet-stream
+ image/png
Property changes on: trunk/documentation/whatsnew/vpe/images/3.3.0.M1/vpe-multiple-selection.png
___________________________________________________________________
Modified: svn:mime-type
- application/octet-stream
+ image/png
Property changes on: trunk/documentation/whatsnew/vpe/images/3.3.0.M2/createJSF2composite_1.png
___________________________________________________________________
Modified: svn:mime-type
- application/octet-stream
+ image/png
Property changes on: trunk/documentation/whatsnew/vpe/images/3.3.0.M2/createJSF2composite_2.png
___________________________________________________________________
Modified: svn:mime-type
- application/octet-stream
+ image/png
Property changes on: trunk/documentation/whatsnew/vpe/images/3.3.0.M3/8719.png
___________________________________________________________________
Modified: svn:mime-type
- application/octet-stream
+ image/png
Property changes on: trunk/documentation/whatsnew/vpe/images/3.3.0.M3/9203.png
___________________________________________________________________
Modified: svn:mime-type
- application/octet-stream
+ image/png
Property changes on: trunk/documentation/whatsnew/vpe/images/3.3.0.M4/8950.png
___________________________________________________________________
Modified: svn:mime-type
- application/octet-stream
+ image/png
Property changes on: trunk/documentation/whatsnew/vpe/images/3.3.0.M4/9674.png
___________________________________________________________________
Modified: svn:mime-type
- application/octet-stream
+ image/png
Property changes on: trunk/documentation/whatsnew/vpe/images/3.3.0.M5/10020.png
___________________________________________________________________
Modified: svn:mime-type
- application/octet-stream
+ image/png
Property changes on: trunk/documentation/whatsnew/vpe/images/3.3.0.M5/9539.png
___________________________________________________________________
Modified: svn:mime-type
- application/octet-stream
+ image/png
Property changes on: trunk/documentation/whatsnew/vpe/images/context-menu.png
___________________________________________________________________
Modified: svn:mime-type
- application/octet-stream
+ image/png
Property changes on: trunk/documentation/whatsnew/vpe/images/css-dialog-calling.png
___________________________________________________________________
Modified: svn:mime-type
- application/octet-stream
+ image/png
Property changes on: trunk/documentation/whatsnew/vpe/images/css-editor-dialog.png
___________________________________________________________________
Modified: svn:mime-type
- application/octet-stream
+ image/png
Property changes on: trunk/documentation/whatsnew/vpe/images/el-configuration.png
___________________________________________________________________
Modified: svn:mime-type
- application/octet-stream
+ image/png
Property changes on: trunk/documentation/whatsnew/vpe/images/jsfcca.png
___________________________________________________________________
Modified: svn:mime-type
- application/octet-stream
+ image/png
Property changes on: trunk/documentation/whatsnew/vpe/images/preview-tab.png
___________________________________________________________________
Modified: svn:mime-type
- application/octet-stream
+ image/png
Property changes on: trunk/documentation/whatsnew/vpe/images/richfaces_3_1_0.png
___________________________________________________________________
Modified: svn:mime-type
- application/octet-stream
+ image/png
Property changes on: trunk/documentation/whatsnew/vpe/images/selection-bar.png
___________________________________________________________________
Modified: svn:mime-type
- application/octet-stream
+ image/png
Property changes on: trunk/documentation/whatsnew/vpe/images/vpe-custom-tags-rendering.png
___________________________________________________________________
Modified: svn:mime-type
- application/octet-stream
+ image/png
Property changes on: trunk/documentation/whatsnew/vpe/images/vpe-horizontal-split.png
___________________________________________________________________
Modified: svn:mime-type
- application/octet-stream
+ image/png
Property changes on: trunk/documentation/whatsnew/vpe/images/vpe-vertical-split.png
___________________________________________________________________
Modified: svn:mime-type
- application/octet-stream
+ image/png
Property changes on: trunk/documentation/whatsnew/vpe/vpe-news-3.3.0.M1.html
___________________________________________________________________
Added: svn:mime-type
+ text/html
Property changes on: trunk/documentation/whatsnew/vpe/vpe-news-3.3.0.M2.html
___________________________________________________________________
Added: svn:mime-type
+ text/html
Property changes on: trunk/documentation/whatsnew/vpe/vpe-news-3.3.0.M3.html
___________________________________________________________________
Added: svn:mime-type
+ text/html
Property changes on: trunk/documentation/whatsnew/vpe/vpe-news-3.3.0.M4.html
___________________________________________________________________
Added: svn:mime-type
+ text/html
Property changes on: trunk/documentation/whatsnew/vpe/vpe-news-3.3.0.M5.html
___________________________________________________________________
Added: svn:mime-type
+ text/html
12 years, 5 months
- 1
- 0
JBoss Tools SVN: r37495 - branches/jbosstools-3.2.x/build/parent.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2011-12-21 11:50:41 -0500 (Wed, 21 Dec 2011)
New Revision: 37495
Modified:
branches/jbosstools-3.2.x/build/parent/pom.xml
Log:
fix versions and suffix -- we're not building Final anymore, but 'M' maintenance builds
Modified: branches/jbosstools-3.2.x/build/parent/pom.xml
===================================================================
--- branches/jbosstools-3.2.x/build/parent/pom.xml 2011-12-21 15:49:27 UTC (rev 37494)
+++ branches/jbosstools-3.2.x/build/parent/pom.xml 2011-12-21 16:50:41 UTC (rev 37495)
@@ -15,9 +15,9 @@
<!--tychoVersion>0.10.0-SNAPSHOT</tychoVersion -->
<tychoVersion>0.10.0</tychoVersion>
<scmBranch>branches/jbosstools-3.2.x</scmBranch>
- <JBT_VERSION>3.2.2</JBT_VERSION>
- <JBDS_VERSION>4.1.1</JBDS_VERSION>
- <BUILD_ALIAS>Final</BUILD_ALIAS>
+ <JBT_VERSION>3.2.3</JBT_VERSION>
+ <JBDS_VERSION>4.1.2</JBDS_VERSION>
+ <BUILD_ALIAS>M</BUILD_ALIAS>
<memoryOptions1>-Xms512m -Xmx1024m -XX:PermSize=256m</memoryOptions1>
<memoryOptions2>-XX:MaxPermSize=256m</memoryOptions2>
<systemProperties></systemProperties>
12 years, 5 months
- 1
- 0
JBoss Tools SVN: r37494 - trunk/common/plugins/org.jboss.tools.common.ui/src/org/jboss/tools/common/ui.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2011-12-21 10:49:27 -0500 (Wed, 21 Dec 2011)
New Revision: 37494
Modified:
trunk/common/plugins/org.jboss.tools.common.ui/src/org/jboss/tools/common/ui/WizardUtils.java
Log:
[JBIDE-10549] simplified the code (removed the countdown latch, replaced by a simple job#join())
Modified: trunk/common/plugins/org.jboss.tools.common.ui/src/org/jboss/tools/common/ui/WizardUtils.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.ui/src/org/jboss/tools/common/ui/WizardUtils.java 2011-12-21 14:58:43 UTC (rev 37493)
+++ trunk/common/plugins/org.jboss.tools.common.ui/src/org/jboss/tools/common/ui/WizardUtils.java 2011-12-21 15:49:27 UTC (rev 37494)
@@ -11,13 +11,10 @@
package org.jboss.tools.common.ui;
import java.lang.reflect.InvocationTargetException;
-import java.util.concurrent.CountDownLatch;
import org.eclipse.core.databinding.DataBindingContext;
import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.jobs.IJobChangeEvent;
import org.eclipse.core.runtime.jobs.Job;
-import org.eclipse.core.runtime.jobs.JobChangeAdapter;
import org.eclipse.jface.operation.IRunnableWithProgress;
import org.eclipse.jface.wizard.IWizard;
import org.eclipse.jface.wizard.IWizardContainer;
@@ -56,16 +53,8 @@
@Override
public void run(IProgressMonitor monitor) throws InvocationTargetException, InterruptedException {
monitor.beginTask(job.getName(), IProgressMonitor.UNKNOWN);
- final CountDownLatch latch = new CountDownLatch(1);
- job.addJobChangeListener(new JobChangeAdapter() {
-
- @Override
- public void done(IJobChangeEvent event) {
- latch.countDown();
- }
- });
job.schedule();
- latch.await();
+ job.join();
monitor.done();
}
});
12 years, 5 months
- 1
- 0
JBoss Tools SVN: r37493 - trunk/vpe/tests/org.jboss.tools.vpe.base.test/src/org/jboss/tools/vpe/base/test.
by jbosstools-commits＠lists.jboss.org
Author: dmaliarevich
Date: 2011-12-21 09:58:43 -0500 (Wed, 21 Dec 2011)
New Revision: 37493
Modified:
trunk/vpe/tests/org.jboss.tools.vpe.base.test/src/org/jboss/tools/vpe/base/test/TestDomUtil.java
Log:
https://issues.jboss.org/browse/JBIDE-5861 - Content test for style now accepts regular expressions.
Modified: trunk/vpe/tests/org.jboss.tools.vpe.base.test/src/org/jboss/tools/vpe/base/test/TestDomUtil.java
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.base.test/src/org/jboss/tools/vpe/base/test/TestDomUtil.java 2011-12-21 14:36:31 UTC (rev 37492)
+++ trunk/vpe/tests/org.jboss.tools.vpe.base.test/src/org/jboss/tools/vpe/base/test/TestDomUtil.java 2011-12-21 14:58:43 UTC (rev 37493)
@@ -193,13 +193,23 @@
String vpeValue = null;
String xmlName = null;
String xmlValue = null;
+ boolean regExpIsUsed = false;
while (m.find()) {
xmlName = m.group(1);
xmlValue = m.group(2);
vpeValue = computedStyle.getPropertyValue(xmlName);
+ regExpIsUsed = xmlValue.startsWith(START_REGEX) && xmlValue.endsWith(END_REGEX);
if (vpeValue == null) {
throw new DOMComparisonException("CSS property [" //$NON-NLS-1$
+ xmlName + "] is missing in VPE visual node", modelNode); //$NON-NLS-1$
+ } else if (regExpIsUsed) {
+ String pattern = xmlValue.substring(1, xmlValue.length() - 1);
+ Matcher matcher = Pattern.compile(pattern).matcher(vpeValue);
+ if (!matcher.find()) {
+ throw new DOMComparisonException("CSS property [" //$NON-NLS-1$
+ + xmlName + "] is [" + vpeValue + "]" //$NON-NLS-1$ //$NON-NLS-2$
+ + ", but pattern is [" + pattern + "]", modelNode); //$NON-NLS-1$ //$NON-NLS-2$
+ }
} else if (!vpeValue.equalsIgnoreCase(xmlValue)) {
throw new DOMComparisonException("CSS property [" //$NON-NLS-1$
+ xmlName + "] is [" + vpeValue + "]" //$NON-NLS-1$ //$NON-NLS-2$
12 years, 5 months
- 1
- 0
JBoss Tools SVN: r37492 - trunk/documentation/whatsnew/vpe.
by jbosstools-commits＠lists.jboss.org
Author: vpakan(a)redhat.com
Date: 2011-12-21 09:36:31 -0500 (Wed, 21 Dec 2011)
New Revision: 37492
Modified:
trunk/documentation/whatsnew/vpe/vpe-news-3.3.0.M5.html
Log:
Fix mistype issue.
Modified: trunk/documentation/whatsnew/vpe/vpe-news-3.3.0.M5.html
===================================================================
--- trunk/documentation/whatsnew/vpe/vpe-news-3.3.0.M5.html 2011-12-21 14:04:43 UTC (rev 37491)
+++ trunk/documentation/whatsnew/vpe/vpe-news-3.3.0.M5.html 2011-12-21 14:36:31 UTC (rev 37492)
@@ -65,7 +65,7 @@
<p></b>
</td>
<td valign="top">
- <p>Now there are "F5" and "CTRL+R" shortcuts to perform vusial refresh in Visual Page Editor.</p>
+ <p>Now there are "F5" and "CTRL+R" shortcuts to perform visual refresh in Visual Page Editor.</p>
<p><img src="images/3.3.0.M5/10020.png" alt="Hot keys for VPE Refresh" /></p>
<p><small>
<a href="https://jira.jboss.org/jira/browse/JBIDE-10020">Related Jira</a>
12 years, 5 months
- 1
- 0