JBoss Tools SVN: r40100 - in trunk/as/plugins/org.jboss.ide.eclipse.as.ui: META-INF and 4 other directories.
by jbosstools-commits＠lists.jboss.org
Author: akazakov
Date: 2012-04-09 13:14:21 -0400 (Mon, 09 Apr 2012)
New Revision: 40100
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/META-INF/MANIFEST.MF
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/Messages.properties
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/actions/ServerActionMessages.java
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/actions/messages.properties
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/extensions/CommonActionProviderUtils.java
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/extensions/ShowInWelcomePageActionProvider.java
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/tools/as/wst/server/ui/xpl/ExploreActionProvider.java
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/plugin.xml
Log:
https://issues.jboss.org/browse/JBIDE-11153 Open With on Servers Tab
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/META-INF/MANIFEST.MF
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/META-INF/MANIFEST.MF 2012-04-06 21:59:16 UTC (rev 40099)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/META-INF/MANIFEST.MF 2012-04-09 17:14:21 UTC (rev 40100)
@@ -57,7 +57,8 @@
org.eclipse.jst.common.project.facet.core;bundle-version="1.4.200",
org.eclipse.wst.common.emfworkbench.integration;bundle-version="1.2.100",
org.jboss.ide.eclipse.as.management.core;bundle-version="1.0.0",
- org.jboss.ide.eclipse.as.dmr;bundle-version="2.3.0"
+ org.jboss.ide.eclipse.as.dmr;bundle-version="2.3.0",
+ org.eclipse.ui.browser;bundle-version="3.3.101"
Bundle-ActivationPolicy: lazy
Export-Package: org.jboss.ide.eclipse.as.ui,
org.jboss.ide.eclipse.as.ui.actions,
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/Messages.properties
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/Messages.properties 2012-04-06 21:59:16 UTC (rev 40099)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/Messages.properties 2012-04-09 17:14:21 UTC (rev 40100)
@@ -196,7 +196,7 @@
EditorLocalDeployment=Local Deployment
EditorRefreshViewer=Refresh Table
-ExploreUtils_Action_Text=Explore
+ExploreUtils_Action_Text=File Browser
ExploreUtils_Description=Explore deploy directory
ShowInJMXConsole_Action_Text=JMX Management Console
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/actions/ServerActionMessages.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/actions/ServerActionMessages.java 2012-04-06 21:59:16 UTC (rev 40099)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/actions/ServerActionMessages.java 2012-04-09 17:14:21 UTC (rev 40100)
@@ -22,4 +22,6 @@
public static String ChangeTimeStampActionDelegate_could_not_register_project;
public static String DeployActionMessageBoxTitle;
public static String DeployActionMessageBoxMsg;
+ public static String OpenWithBrowser;
+ public static String OpenWithBrowserDescription;
}
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/actions/messages.properties
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/actions/messages.properties 2012-04-06 21:59:16 UTC (rev 40099)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/actions/messages.properties 2012-04-09 17:14:21 UTC (rev 40100)
@@ -10,4 +10,6 @@
ChangeTimeStampActionDelegate_cannot_unregister=Cannot unregister project {0} from server {1}
ChangeTimeStampActionDelegate_could_not_register_project=Could not register project {0}
DeployActionMessageBoxTitle=Really mark these resources as deployable?
-DeployActionMessageBoxMsg=The selection's enclosing projects are already able to be deployed to servers. Marking the selected resources as deployable may be neither necessary nor desired.\n\nYou may prefer to use "Run As -> Run on server" instead.\n\nContinue marking these resources deployable?
\ No newline at end of file
+DeployActionMessageBoxMsg=The selection's enclosing projects are already able to be deployed to servers. Marking the selected resources as deployable may be neither necessary nor desired.\n\nYou may prefer to use "Run As -> Run on server" instead.\n\nContinue marking these resources deployable?
+OpenWithBrowser=Web Browser
+OpenWithBrowserDescription=Open With Web Browser
\ No newline at end of file
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/extensions/CommonActionProviderUtils.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/extensions/CommonActionProviderUtils.java 2012-04-06 21:59:16 UTC (rev 40099)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/extensions/CommonActionProviderUtils.java 2012-04-09 17:14:21 UTC (rev 40100)
@@ -14,27 +14,32 @@
import org.eclipse.jface.action.IContributionItem;
import org.eclipse.jface.action.IMenuManager;
import org.eclipse.jface.action.MenuManager;
+import org.eclipse.jface.bindings.TriggerSequence;
import org.eclipse.jface.viewers.ISelection;
import org.eclipse.jface.viewers.ISelectionProvider;
import org.eclipse.jface.viewers.IStructuredSelection;
import org.eclipse.jface.viewers.StructuredViewer;
+import org.eclipse.ui.IWorkbench;
import org.eclipse.ui.IWorkbenchPage;
import org.eclipse.ui.IWorkbenchPart;
import org.eclipse.ui.IWorkbenchWindow;
import org.eclipse.ui.PartInitException;
import org.eclipse.ui.PlatformUI;
+import org.eclipse.ui.keys.IBindingService;
import org.eclipse.ui.navigator.CommonViewer;
import org.eclipse.ui.navigator.ICommonActionExtensionSite;
import org.eclipse.ui.navigator.ICommonViewerSite;
import org.eclipse.ui.navigator.ICommonViewerWorkbenchSite;
import org.eclipse.wst.server.core.IServer;
+import org.eclipse.wst.server.ui.internal.Messages;
+import org.eclipse.wst.server.ui.internal.cnf.ServerActionProvider;
/**
* @author André Dietisheim
*/
public class CommonActionProviderUtils {
- private static final String SHOW_IN_QUICK_MENU_ID = "org.eclipse.ui.navigate.showInQuickMenu"; //$NON-NLS-1$
+ private static final String SHOW_IN_QUICK_MENU_ID = ServerActionProvider.SHOW_IN_MENU_ID;
public static ICommonViewerWorkbenchSite getCommonViewerWorkbenchSite(ICommonActionExtensionSite actionExtensionSite) {
ICommonViewerWorkbenchSite wsSite = null;
@@ -67,15 +72,32 @@
return selection != null
&& selection.getFirstElement() instanceof IServer;
}
-
+
public static IContributionItem getShowInQuickMenu(IMenuManager menuManager) {
+ return getShowInQuickMenu(menuManager, false);
+ }
+
+ public static IContributionItem getShowInQuickMenu(IMenuManager menuManager, boolean createShowInMenu) {
IContributionItem item = null;
if (menuManager != null) {
item = menuManager.find(SHOW_IN_QUICK_MENU_ID);
+ if(item==null && createShowInMenu) {
+ String text = Messages.actionShowIn;
+ final IWorkbench workbench = PlatformUI.getWorkbench();
+ final IBindingService bindingService = (IBindingService) workbench
+ .getAdapter(IBindingService.class);
+ final TriggerSequence[] activeBindings = bindingService
+ .getActiveBindingsFor(SHOW_IN_QUICK_MENU_ID);
+ if (activeBindings.length > 0) {
+ text += "\t" + activeBindings[0].format();
+ }
+ item = new MenuManager(text, SHOW_IN_QUICK_MENU_ID);
+ menuManager.insertAfter(ServerActionProvider.TOP_SECTION_END_SEPARATOR, item);
+ }
}
return item;
}
-
+
public static void addToShowInQuickSubMenu(IAction action, IMenuManager menu, ICommonActionExtensionSite actionSite) {
IStructuredSelection selection = CommonActionProviderUtils.getSelection(actionSite);
IContributionItem menuItem = CommonActionProviderUtils.getShowInQuickMenu(menu);
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/extensions/ShowInWelcomePageActionProvider.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/extensions/ShowInWelcomePageActionProvider.java 2012-04-06 21:59:16 UTC (rev 40099)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/extensions/ShowInWelcomePageActionProvider.java 2012-04-09 17:14:21 UTC (rev 40100)
@@ -10,42 +10,163 @@
******************************************************************************/
package org.jboss.ide.eclipse.as.ui.views.server.extensions;
-import org.eclipse.core.runtime.CoreException;
+import java.net.URL;
+
import org.eclipse.core.runtime.NullProgressMonitor;
+import org.eclipse.jface.action.Action;
+import org.eclipse.jface.action.IContributionItem;
+import org.eclipse.jface.action.IMenuManager;
+import org.eclipse.jface.action.MenuManager;
+import org.eclipse.jface.viewers.ISelectionProvider;
import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.jface.viewers.StructuredViewer;
+import org.eclipse.ui.internal.browser.ImageResource;
+import org.eclipse.ui.navigator.CommonActionProvider;
+import org.eclipse.ui.navigator.CommonViewer;
+import org.eclipse.ui.navigator.ICommonActionExtensionSite;
+import org.eclipse.ui.navigator.ICommonViewerSite;
+import org.eclipse.ui.navigator.ICommonViewerWorkbenchSite;
+import org.eclipse.wst.server.core.IModule;
+import org.eclipse.wst.server.core.IModuleType;
import org.eclipse.wst.server.core.IServer;
-import org.jboss.ide.eclipse.as.core.server.internal.JBossServer;
+import org.eclipse.wst.server.core.model.IURLProvider;
+import org.eclipse.wst.server.ui.internal.view.servers.ModuleServer;
import org.jboss.ide.eclipse.as.core.server.internal.extendedproperties.ServerExtendedProperties;
-import org.jboss.ide.eclipse.as.core.util.ServerUtil;
-import org.jboss.ide.eclipse.as.ui.Messages;
+import org.jboss.ide.eclipse.as.ui.JBossServerUIPlugin;
+import org.jboss.ide.eclipse.as.ui.actions.ServerActionMessages;
+import org.jboss.ide.eclipse.as.ui.launch.JBTWebLaunchableClient;
-import com.ibm.icu.text.MessageFormat;
+public class ShowInWelcomePageActionProvider extends CommonActionProvider {
-public class ShowInWelcomePageActionProvider extends AbstractOpenBrowserServerAction {
+ private Action action;
+ private ICommonActionExtensionSite actionSite;
- private static String WELCOME_PAGE_URL_PATTERN = "http://{0}:{1}/"; //$NON-NLS-1$
- protected String getActionText() {
- return Messages.ShowInWelcomePage_Action_Text;
+ /*
+ * (non-Javadoc)
+ * @see org.eclipse.ui.navigator.CommonActionProvider#init(org.eclipse.ui.navigator.ICommonActionExtensionSite)
+ */
+ @Override
+ public void init(ICommonActionExtensionSite aSite) {
+ super.init(aSite);
+ actionSite = aSite;
+ ICommonViewerSite site = aSite.getViewSite();
+ if( site instanceof ICommonViewerWorkbenchSite ) {
+ StructuredViewer v = aSite.getStructuredViewer();
+ if( v instanceof CommonViewer ) {
+ ICommonViewerWorkbenchSite wsSite = (ICommonViewerWorkbenchSite)site;
+ createActions((CommonViewer)v, wsSite.getSelectionProvider());
+ }
+ }
}
-
- protected boolean shouldAddForSelection(IStructuredSelection sel) {
- IServer server = getSingleServer(sel);
- if( server != null ) {
- ServerExtendedProperties props = (ServerExtendedProperties)
- server.loadAdapter(ServerExtendedProperties.class, new NullProgressMonitor());
- if( props != null && props.hasWelcomePage())
- return true;
+
+ public void createActions(CommonViewer tableViewer, ISelectionProvider provider) {
+ action = new Action() {
+ @Override
+ public void run() {
+ String url = getUrl();
+ if(url!=null) {
+ JBTWebLaunchableClient.checkedCreateInternalBrowser(url, getServer().getName(), JBossServerUIPlugin.PLUGIN_ID, JBossServerUIPlugin.getDefault().getLog());
+ }
+ }
+ };
+ action.setText(ServerActionMessages.OpenWithBrowser);
+ action.setDescription(ServerActionMessages.OpenWithBrowserDescription);
+ action.setImageDescriptor(ImageResource.getImageDescriptor(ImageResource.IMG_INTERNAL_BROWSER));
+ }
+
+ private String getUrl() {
+ String urlString = null;
+ IServer server = getServer();
+ if(server!=null && server.getServerState() == IServer.STATE_STARTED) {
+ ModuleServer ms = getModuleServer();
+ if(ms!=null) {
+ IModule[] mss = ms.getModule();
+ IModule m = getWebModule(mss);
+ if(m!=null) {
+ IServer s = getServer();
+ Object o = s.loadAdapter(IURLProvider.class, null);
+ if(o instanceof IURLProvider) {
+ URL url = ((IURLProvider)o).getModuleRootURL(m);
+ if(url!=null) {
+ urlString = url.toString();
+ }
+ }
+ }
+ } else {
+ ServerExtendedProperties props = (ServerExtendedProperties)server.loadAdapter(ServerExtendedProperties.class, new NullProgressMonitor());
+ urlString = props.getWelcomePageUrl();
+ }
}
- return false;
+ return urlString;
}
- protected boolean accepts(IServer server) {
- return server.getServerState() == IServer.STATE_STARTED;
+ private IModule getWebModule(IModule[] m) {
+ if(m.length>0) {
+ IModule module = m[m.length-1];
+ if(isWebModule(module)) {
+ return module;
+ } else {
+ IServer s = getServer();
+ IModule[] mms = s.getChildModules(m, null);
+ for (IModule child : mms) {
+ if(isWebModule(child)) {
+ return child;
+ }
+ }
+ }
+ }
+ return null;
}
-
- protected String getURL(IServer server) throws CoreException {
- ServerExtendedProperties props = (ServerExtendedProperties)
- server.loadAdapter(ServerExtendedProperties.class, new NullProgressMonitor());
- return props.getWelcomePageUrl();
+
+ private boolean isWebModule(IModule module) {
+ IModuleType type = module.getModuleType();
+ return "jst.web".equals(type.getId()); //$NON-NLS-1$
}
-}
+
+ /*
+ * (non-Javadoc)
+ * @see org.eclipse.ui.actions.ActionGroup#fillContextMenu(org.eclipse.jface.action.IMenuManager)
+ */
+ @Override
+ public void fillContextMenu(IMenuManager menu) {
+ if( getModuleServer() != null || getServer()!=null ) {
+ IContributionItem menuItem = CommonActionProviderUtils.getShowInQuickMenu(menu, true);
+ if (menuItem instanceof MenuManager) {
+ ((MenuManager) menuItem).add(action);
+ action.setEnabled(getUrl()!=null);
+ }
+ }
+ }
+
+ public IServer getServer() {
+ Object o = getSelection();
+ if (o instanceof IServer) {
+ return ((IServer)o);
+ }
+ if( o instanceof ModuleServer) {
+ return ((ModuleServer) o).server;
+ }
+ return null;
+ }
+
+ public ModuleServer getModuleServer() {
+ Object o = getSelection();
+ if(o instanceof ModuleServer) {
+ return ((ModuleServer) o);
+ }
+ return null;
+ }
+
+ protected Object getSelection() {
+ ICommonViewerSite site = actionSite.getViewSite();
+ IStructuredSelection selection = null;
+ if (site instanceof ICommonViewerWorkbenchSite) {
+ ICommonViewerWorkbenchSite wsSite = (ICommonViewerWorkbenchSite)site;
+ selection = (IStructuredSelection) wsSite.getSelectionProvider().getSelection();
+ if( selection.size() == 1 ) {
+ return selection.getFirstElement();
+ }
+ }
+ return null;
+ }
+}
\ No newline at end of file
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/tools/as/wst/server/ui/xpl/ExploreActionProvider.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/tools/as/wst/server/ui/xpl/ExploreActionProvider.java 2012-04-06 21:59:16 UTC (rev 40099)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/tools/as/wst/server/ui/xpl/ExploreActionProvider.java 2012-04-09 17:14:21 UTC (rev 40100)
@@ -15,7 +15,9 @@
import org.eclipse.core.runtime.IPath;
import org.eclipse.jface.action.Action;
+import org.eclipse.jface.action.IContributionItem;
import org.eclipse.jface.action.IMenuManager;
+import org.eclipse.jface.action.MenuManager;
import org.eclipse.jface.viewers.ISelectionProvider;
import org.eclipse.jface.viewers.IStructuredSelection;
import org.eclipse.jface.viewers.StructuredViewer;
@@ -27,13 +29,13 @@
import org.eclipse.ui.navigator.ICommonViewerWorkbenchSite;
import org.eclipse.wst.server.core.IModule;
import org.eclipse.wst.server.core.IServer;
-import org.eclipse.wst.server.ui.internal.cnf.ServerActionProvider;
import org.eclipse.wst.server.ui.internal.view.servers.ModuleServer;
import org.jboss.ide.eclipse.as.core.publishers.LocalPublishMethod;
import org.jboss.ide.eclipse.as.core.server.IDeployableServer;
import org.jboss.ide.eclipse.as.core.util.ServerConverter;
import org.jboss.ide.eclipse.as.ui.JBossServerUISharedImages;
import org.jboss.ide.eclipse.as.ui.actions.ExploreUtils;
+import org.jboss.ide.eclipse.as.ui.views.server.extensions.CommonActionProviderUtils;
public class ExploreActionProvider extends CommonActionProvider {
public static interface IExploreBehavior {
public boolean canExplore(IServer server, IModule[] module);
@@ -123,15 +125,24 @@
}
public void fillContextMenu(IMenuManager menu) {
- String mode = getServer().getAttribute(IDeployableServer.SERVER_MODE, LocalPublishMethod.LOCAL_PUBLISH_METHOD);
- IExploreBehavior beh = exploreBehaviorMap.get(mode);
- if( beh == null || !beh.canExplore(getServer(), getModuleServer() == null ? null : getModuleServer().module))
- return;
- if( getModuleServer() != null )
- menu.insertBefore(ServerActionProvider.CONTROL_MODULE_SECTION_END_SEPARATOR, exploreAction);
- else if( getServer() != null )
- menu.insertBefore(ServerActionProvider.SERVER_ETC_SECTION_END_SEPARATOR, exploreAction);
- exploreAction.setEnabled(true);
+ IServer server = getServer();
+ if(server!=null) {
+ String mode = server.getAttribute(IDeployableServer.SERVER_MODE, LocalPublishMethod.LOCAL_PUBLISH_METHOD);
+ IExploreBehavior beh = exploreBehaviorMap.get(mode);
+ if( beh == null || !beh.canExplore(getServer(), getModuleServer() == null ? null : getModuleServer().module))
+ return;
+ if( getModuleServer() != null || getServer() != null ) {
+ IContributionItem menuItem = CommonActionProviderUtils.getShowInQuickMenu(menu, true);
+ if (menuItem instanceof MenuManager) {
+ ((MenuManager) menuItem).add(exploreAction);
+ }
+ }
+ // if( getModuleServer() != null )
+ // menu.insertBefore(ServerActionProvider.CONTROL_MODULE_SECTION_END_SEPARATOR, exploreAction);
+ // else if( getServer() != null )
+ // menu.insertBefore(ServerActionProvider.SERVER_ETC_SECTION_END_SEPARATOR, exploreAction);
+ exploreAction.setEnabled(true);
+ }
}
public IServer getServer() {
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/plugin.xml
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/plugin.xml 2012-04-06 21:59:16 UTC (rev 40099)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/plugin.xml 2012-04-09 17:14:21 UTC (rev 40100)
@@ -398,9 +398,14 @@
class="org.jboss.ide.eclipse.as.ui.views.server.extensions.ShowInWelcomePageActionProvider"
id="org.jboss.ide.eclipse.as.ui.extensions.welcomePage">
<enablement>
- <instanceof
- value="org.eclipse.wst.server.core.IServer">
- </instanceof>
+ <or>
+ <instanceof
+ value="org.eclipse.wst.server.core.IServer">
+ </instanceof>
+ <instanceof
+ value="org.eclipse.wst.server.ui.internal.view.servers.ModuleServer">
+ </instanceof>
+ </or>
</enablement>
</actionProvider>
<actionProvider
13 years, 8 months
- 1
- 0
JBoss Tools SVN: r40099 - trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2012-04-06 17:59:16 -0400 (Fri, 06 Apr 2012)
New Revision: 40099
Modified:
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeDataTableColumnCreator.java
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeHtmlTemplate.java
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpePanelGridCreator.java
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeStyleCreator.java
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/ZoomEventManager.java
Log:
fix for PMD warnings in VPE
Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeDataTableColumnCreator.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeDataTableColumnCreator.java 2012-04-06 21:31:08 UTC (rev 40098)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeDataTableColumnCreator.java 2012-04-06 21:59:16 UTC (rev 40099)
@@ -202,7 +202,7 @@
@Override
public void removeElement(VpePageContext pageContext, Element sourceElement, Map visualNodeMap) {
Object elements = visualNodeMap.get(this);
- if (elements != null && elements instanceof VisualColumnElements) {
+ if (elements instanceof VisualColumnElements) {
removeChild(((VisualColumnElements)elements).getHeaderCell());
removeChild(((VisualColumnElements)elements).getBodyCell());
removeChild(((VisualColumnElements)elements).getFooterCell());
Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeHtmlTemplate.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeHtmlTemplate.java 2012-04-06 21:31:08 UTC (rev 40098)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeHtmlTemplate.java 2012-04-06 21:59:16 UTC (rev 40099)
@@ -564,7 +564,7 @@
@Override
public IRegion getSourceRegionForOpenOn(VpePageContext pageContext,
Node sourceNode, nsIDOMNode domNode) {
- if(sourceNode != null && sourceNode instanceof Element) {
+ if(sourceNode instanceof Element) {
Element sourceElement = (Element) sourceNode;
String templateName = VpeTemplateManager.getInstance()
.getTemplateName(pageContext, sourceElement);
Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpePanelGridCreator.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpePanelGridCreator.java 2012-04-06 21:31:08 UTC (rev 40098)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpePanelGridCreator.java 2012-04-06 21:59:16 UTC (rev 40099)
@@ -51,21 +51,18 @@
// private Set dependencySet;
- VpePanelGridCreator(Element gridElement, VpeDependencyMap dependencyMap,
- boolean caseSensitive) {
+ VpePanelGridCreator(Element gridElement, VpeDependencyMap dependencyMap, boolean caseSensitive) {
this.caseSensitive = caseSensitive;
build(gridElement, dependencyMap);
}
private void build(Element gridElement, VpeDependencyMap dependencyMap) {
- Attr tableSizeAttr = gridElement
- .getAttributeNode(VpeTemplateManager.ATTR_PANELGRID_TABLE_SIZE);
+ Attr tableSizeAttr = gridElement.getAttributeNode(VpeTemplateManager.ATTR_PANELGRID_TABLE_SIZE);
if (tableSizeAttr != null) {
try {
- VpeExpressionInfo info = VpeExpressionBuilder
- .buildCompletedExpression(tableSizeAttr.getValue(),
- caseSensitive);
+ VpeExpressionInfo info = VpeExpressionBuilder.buildCompletedExpression(tableSizeAttr.getValue(),
+ caseSensitive);
tableSizeExpr = info.getExpression();
dependencyMap.setCreator(this, info.getDependencySet());
} catch (VpeExpressionBuilderException e) {
@@ -73,13 +70,11 @@
}
}
- Attr headerClassAttr = gridElement
- .getAttributeNode(VpeTemplateManager.ATTR_PANELGRID_HEADER_CLASS);
+ Attr headerClassAttr = gridElement.getAttributeNode(VpeTemplateManager.ATTR_PANELGRID_HEADER_CLASS);
if (headerClassAttr != null) {
try {
- VpeExpressionInfo info = VpeExpressionBuilder
- .buildCompletedExpression(headerClassAttr.getValue(),
- caseSensitive);
+ VpeExpressionInfo info = VpeExpressionBuilder.buildCompletedExpression(headerClassAttr.getValue(),
+ caseSensitive);
headerClassExpr = info.getExpression();
dependencyMap.setCreator(this, info.getDependencySet());
} catch (VpeExpressionBuilderException e) {
@@ -87,13 +82,11 @@
}
}
- Attr footerClassAttr = gridElement
- .getAttributeNode(VpeTemplateManager.ATTR_PANELGRID_FOOTER_CLASS);
+ Attr footerClassAttr = gridElement.getAttributeNode(VpeTemplateManager.ATTR_PANELGRID_FOOTER_CLASS);
if (footerClassAttr != null) {
try {
- VpeExpressionInfo info = VpeExpressionBuilder
- .buildCompletedExpression(footerClassAttr.getValue(),
- caseSensitive);
+ VpeExpressionInfo info = VpeExpressionBuilder.buildCompletedExpression(footerClassAttr.getValue(),
+ caseSensitive);
footerClassExpr = info.getExpression();
dependencyMap.setCreator(this, info.getDependencySet());
} catch (VpeExpressionBuilderException e) {
@@ -101,13 +94,11 @@
}
}
- Attr rowClassesAttr = gridElement
- .getAttributeNode(VpeTemplateManager.ATTR_PANELGRID_ROW_CLASSES);
+ Attr rowClassesAttr = gridElement.getAttributeNode(VpeTemplateManager.ATTR_PANELGRID_ROW_CLASSES);
if (rowClassesAttr != null) {
try {
- VpeExpressionInfo info = VpeExpressionBuilder
- .buildCompletedExpression(rowClassesAttr.getValue(),
- caseSensitive);
+ VpeExpressionInfo info = VpeExpressionBuilder.buildCompletedExpression(rowClassesAttr.getValue(),
+ caseSensitive);
rowClassesExpr = info.getExpression();
dependencyMap.setCreator(this, info.getDependencySet());
} catch (VpeExpressionBuilderException e) {
@@ -115,13 +106,11 @@
}
}
- Attr columnClassesAttr = gridElement
- .getAttributeNode(VpeTemplateManager.ATTR_PANELGRID_COLUMN_CLASSES);
+ Attr columnClassesAttr = gridElement.getAttributeNode(VpeTemplateManager.ATTR_PANELGRID_COLUMN_CLASSES);
if (columnClassesAttr != null) {
try {
- VpeExpressionInfo info = VpeExpressionBuilder
- .buildCompletedExpression(columnClassesAttr.getValue(),
- caseSensitive);
+ VpeExpressionInfo info = VpeExpressionBuilder.buildCompletedExpression(columnClassesAttr.getValue(),
+ caseSensitive);
columnClassesExpr = info.getExpression();
dependencyMap.setCreator(this, info.getDependencySet());
} catch (VpeExpressionBuilderException e) {
@@ -129,13 +118,11 @@
}
}
- Attr captionClassesAttr = gridElement
- .getAttributeNode(VpeTemplateManager.ATTR_PANELGRID_CAPTION_CLASS);
+ Attr captionClassesAttr = gridElement.getAttributeNode(VpeTemplateManager.ATTR_PANELGRID_CAPTION_CLASS);
if (captionClassesAttr != null) {
try {
- VpeExpressionInfo info = VpeExpressionBuilder
- .buildCompletedExpression(
- captionClassesAttr.getValue(), caseSensitive);
+ VpeExpressionInfo info = VpeExpressionBuilder.buildCompletedExpression(captionClassesAttr.getValue(),
+ caseSensitive);
captionClassExpr = info.getExpression();
dependencyMap.setCreator(this, info.getDependencySet());
} catch (VpeExpressionBuilderException e) {
@@ -143,13 +130,11 @@
}
}
- Attr captionStyleAttr = gridElement
- .getAttributeNode(VpeTemplateManager.ATTR_PANELGRID_CAPTION_STYLE);
+ Attr captionStyleAttr = gridElement.getAttributeNode(VpeTemplateManager.ATTR_PANELGRID_CAPTION_STYLE);
if (captionStyleAttr != null) {
try {
- VpeExpressionInfo info = VpeExpressionBuilder
- .buildCompletedExpression(captionStyleAttr.getValue(),
- caseSensitive);
+ VpeExpressionInfo info = VpeExpressionBuilder.buildCompletedExpression(captionStyleAttr.getValue(),
+ caseSensitive);
captionStyleExpr = info.getExpression();
dependencyMap.setCreator(this, info.getDependencySet());
} catch (VpeExpressionBuilderException e) {
@@ -157,13 +142,11 @@
}
}
- Attr rulesAttr = gridElement
- .getAttributeNode(VpeTemplateManager.ATTR_PANELGRID_RULES);
+ Attr rulesAttr = gridElement.getAttributeNode(VpeTemplateManager.ATTR_PANELGRID_RULES);
if (rulesAttr != null) {
try {
- VpeExpressionInfo info = VpeExpressionBuilder
- .buildCompletedExpression(rulesAttr.getValue(),
- caseSensitive);
+ VpeExpressionInfo info = VpeExpressionBuilder.buildCompletedExpression(rulesAttr.getValue(),
+ caseSensitive);
rulesExpr = info.getExpression();
dependencyMap.setCreator(this, info.getDependencySet());
} catch (VpeExpressionBuilderException e) {
@@ -178,17 +161,16 @@
if (attr != null) {
if (propertyCreators == null)
propertyCreators = new ArrayList();
- propertyCreators.add(new VpeAttributeCreator(attrName, attr
- .getValue(), dependencyMap, caseSensitive));
+ propertyCreators.add(new VpeAttributeCreator(attrName, attr.getValue(), dependencyMap,
+ caseSensitive));
}
}
}
}
@Override
- public VpeCreatorInfo create(VpePageContext pageContext, Node sourceNode,
- nsIDOMDocument visualDocument, nsIDOMElement visualElement,
- Map visualNodeMap) throws VpeExpressionException {
+ public VpeCreatorInfo create(VpePageContext pageContext, Node sourceNode, nsIDOMDocument visualDocument,
+ nsIDOMElement visualElement, Map visualNodeMap) throws VpeExpressionException {
int tableSize = 1;
if (tableSizeExpr != null) {
VpeValue vpeValue = tableSizeExpr.exec(pageContext, sourceNode);
@@ -211,8 +193,7 @@
for (int i = 0; i < propertyCreators.size(); i++) {
VpeCreator creator = (VpeCreator) propertyCreators.get(i);
if (creator != null) {
- VpeCreatorInfo info = creator.create(pageContext,
- sourceNode, visualDocument, visualTable,
+ VpeCreatorInfo info = creator.create(pageContext, sourceNode, visualDocument, visualTable,
visualNodeMap);
if (info != null && info.getVisualNode() != null) {
nsIDOMAttr attr = (nsIDOMAttr) info.getVisualNode();
@@ -223,229 +204,219 @@
}
if (rulesExpr != null) {
- String rules = rulesExpr.exec(pageContext, sourceNode)
- .stringValue();
+ String rules = rulesExpr.exec(pageContext, sourceNode).stringValue();
if (rules.length() > 0)
- visualTable.setAttribute(
- VpeTemplateManager.ATTR_PANELGRID_RULES, rules);
+ visualTable.setAttribute(VpeTemplateManager.ATTR_PANELGRID_RULES, rules);
}
NodeList children = sourceNode.getChildNodes();
int count = children != null ? children.getLength() : 0;
if (count > 0) {
- Node header = null;
- Node footer = null;
- Node caption = null;
- Node[] sourceChildren = new Node[count];
- int childrenCount = 0;
- for (int i = 0; i < count; i++) {
- Node node = children.item(i);
- int type = node.getNodeType();
- if ((type == Node.ELEMENT_NODE)
- || ((type == Node.TEXT_NODE)
- && (node.getNodeValue() != null)
- && (node.getNodeValue().trim().length() > 0))) {
- switch (VpeCreatorUtil.getFacetType(node, pageContext)) {
- case VpeCreatorUtil.FACET_TYPE_HEADER:
- header = node;
- break;
- case VpeCreatorUtil.FACET_TYPE_FOOTER:
- footer = node;
- break;
- case VpeCreatorUtil.FACET_TYPE_CAPTION:
- caption = node;
- break;
- default:
- sourceChildren[childrenCount] = node;
- childrenCount++;
- break;
- }
+ Node header = null;
+ Node footer = null;
+ Node caption = null;
+ Node[] sourceChildren = new Node[count];
+ int childrenCount = 0;
+ for (int i = 0; i < count; i++) {
+ Node node = children.item(i);
+ int type = node.getNodeType();
+ if ((type == Node.ELEMENT_NODE)
+ || ((type == Node.TEXT_NODE) && (node.getNodeValue() != null) && (node.getNodeValue().trim()
+ .length() > 0))) {
+ switch (VpeCreatorUtil.getFacetType(node, pageContext)) {
+ case VpeCreatorUtil.FACET_TYPE_HEADER:
+ header = node;
+ break;
+ case VpeCreatorUtil.FACET_TYPE_FOOTER:
+ footer = node;
+ break;
+ case VpeCreatorUtil.FACET_TYPE_CAPTION:
+ caption = node;
+ break;
+ default:
+ sourceChildren[childrenCount] = node;
+ childrenCount++;
+ break;
+ }
+ }
}
- }
- if (childrenCount > 0) {
- if (tableSize == 0) {
- tableSize = childrenCount;
- }
- Map<String, List<Node>> captionFacetChildren = null;
- Map<String, List<Node>> headerFacetChildren = null;
- Map<String, List<Node>> footerFacetChildren = null;
- captionFacetChildren = VisualDomUtil.findFacetElements(caption, pageContext);
- headerFacetChildren = VisualDomUtil.findFacetElements(header, pageContext);
- footerFacetChildren = VisualDomUtil.findFacetElements(footer, pageContext);
- /*
- * Add additional table cell for odd facet's elements.
- */
- boolean captionHtmlElementsPresents = ((null != captionFacetChildren) && (captionFacetChildren.get(VisualDomUtil.FACET_HTML_TAGS).size() > 0));
- boolean headerHtmlElementsPresents = ((null != headerFacetChildren) && (headerFacetChildren.get(VisualDomUtil.FACET_HTML_TAGS).size() > 0));
- boolean footerHtmlElementsPresents = ((null != footerFacetChildren) && (footerFacetChildren.get(VisualDomUtil.FACET_HTML_TAGS).size() > 0));
- boolean htmlFacetsElementsPresents = captionHtmlElementsPresents || headerHtmlElementsPresents || footerHtmlElementsPresents;
- boolean htmlFacetsElementsRendered = false;
- if (htmlFacetsElementsPresents) {
- childrenCount++;
- }
- int rowCount = (childrenCount + tableSize - 1) / tableSize;
+ if (childrenCount > 0) {
+ if (tableSize == 0) {
+ tableSize = childrenCount;
+ }
+ Map<String, List<Node>> captionFacetChildren = null;
+ Map<String, List<Node>> headerFacetChildren = null;
+ Map<String, List<Node>> footerFacetChildren = null;
+ captionFacetChildren = VisualDomUtil.findFacetElements(caption, pageContext);
+ headerFacetChildren = VisualDomUtil.findFacetElements(header, pageContext);
+ footerFacetChildren = VisualDomUtil.findFacetElements(footer, pageContext);
+ /*
+ * Add additional table cell for odd facet's elements.
+ */
+ boolean captionHtmlElementsPresents = ((null != captionFacetChildren) && (captionFacetChildren.get(
+ VisualDomUtil.FACET_HTML_TAGS).size() > 0));
+ boolean headerHtmlElementsPresents = ((null != headerFacetChildren) && (headerFacetChildren.get(
+ VisualDomUtil.FACET_HTML_TAGS).size() > 0));
+ boolean footerHtmlElementsPresents = ((null != footerFacetChildren) && (footerFacetChildren.get(
+ VisualDomUtil.FACET_HTML_TAGS).size() > 0));
+ boolean htmlFacetsElementsPresents = captionHtmlElementsPresents || headerHtmlElementsPresents
+ || footerHtmlElementsPresents;
+ boolean htmlFacetsElementsRendered = false;
+ if (htmlFacetsElementsPresents) {
+ childrenCount++;
+ }
+ int rowCount = (childrenCount + tableSize - 1) / tableSize;
- nsIDOMElement visualHead = null;
- nsIDOMElement visualFoot = null;
- nsIDOMElement visualCaption = null;
+ nsIDOMElement visualHead = null;
+ nsIDOMElement visualFoot = null;
+ nsIDOMElement visualCaption = null;
- if (caption != null) {
- visualCaption = visualDocument
- .createElement(HTML.TAG_CAPTION);
- visualTable.appendChild(visualCaption);
- VpeChildrenInfo childrenInfo = new VpeChildrenInfo(visualCaption);
- childrenInfo.addSourceChild(caption);
- creatorInfo.addChildrenInfo(childrenInfo);
- if (captionClassExpr != null
- && caption.getParentNode() != null) {
- String captionClass = captionClassExpr.exec(
- pageContext, caption.getParentNode())
- .stringValue();
- visualCaption.setAttribute(HTML.ATTR_CLASS, captionClass);
- }
+ if (caption != null) {
+ visualCaption = visualDocument.createElement(HTML.TAG_CAPTION);
+ visualTable.appendChild(visualCaption);
+ VpeChildrenInfo childrenInfo = new VpeChildrenInfo(visualCaption);
+ childrenInfo.addSourceChild(caption);
+ creatorInfo.addChildrenInfo(childrenInfo);
+ if (captionClassExpr != null && caption.getParentNode() != null) {
+ String captionClass = captionClassExpr.exec(pageContext, caption.getParentNode()).stringValue();
+ visualCaption.setAttribute(HTML.ATTR_CLASS, captionClass);
+ }
- if (captionStyleExpr != null
- && caption.getParentNode() != null) {
- String captionStyle = captionStyleExpr.exec(
- pageContext, caption.getParentNode())
- .stringValue();
- visualCaption.setAttribute(HTML.ATTR_STYLE, captionStyle);
- }
- }
- if (header != null) {
- visualHead = visualDocument.createElement(HTML.TAG_THEAD);
- visualTable.appendChild(visualHead);
- }
- if (footer != null) {
- visualFoot = visualDocument.createElement(HTML.TAG_TFOOT);
- visualTable.appendChild(visualFoot);
- }
+ if (captionStyleExpr != null && caption.getParentNode() != null) {
+ String captionStyle = captionStyleExpr.exec(pageContext, caption.getParentNode()).stringValue();
+ visualCaption.setAttribute(HTML.ATTR_STYLE, captionStyle);
+ }
+ }
+ if (header != null) {
+ visualHead = visualDocument.createElement(HTML.TAG_THEAD);
+ visualTable.appendChild(visualHead);
+ }
+ if (footer != null) {
+ visualFoot = visualDocument.createElement(HTML.TAG_TFOOT);
+ visualTable.appendChild(visualFoot);
+ }
- nsIDOMElement visualBody = visualDocument
- .createElement(HTML.TAG_TBODY);
- visualTable.appendChild(visualBody);
+ nsIDOMElement visualBody = visualDocument.createElement(HTML.TAG_TBODY);
+ visualTable.appendChild(visualBody);
- List<String> rowClasses = VpeClassUtil.getClasses(rowClassesExpr, sourceNode,
- pageContext);
- List<String> columnClasses = VpeClassUtil.getClasses(columnClassesExpr, sourceNode,
- pageContext);
+ List<String> rowClasses = VpeClassUtil.getClasses(rowClassesExpr, sourceNode, pageContext);
+ List<String> columnClasses = VpeClassUtil.getClasses(columnClassesExpr, sourceNode, pageContext);
- int rci = 0; // index of row class
- for (int i = 0; i < rowCount; i++) {
- int cci = 0; // index of column class. Reset on every new row.
+ int rci = 0; // index of row class
+ for (int i = 0; i < rowCount; i++) {
+ int cci = 0; // index of column class. Reset on every new
+ // row.
- nsIDOMElement visualRow = visualDocument.createElement(HTML.TAG_TR);
- if (rowClasses.size() > 0) {
- visualRow.setAttribute(HTML.ATTR_CLASS, rowClasses.get(rci)
- .toString());
- rci++;
- if (rci >= rowClasses.size())
- rci = 0;
- }
- for (int j = 0; j < tableSize; j++) {
- if (i*tableSize+j >= childrenCount) {
- break;
+ nsIDOMElement visualRow = visualDocument.createElement(HTML.TAG_TR);
+ if (!rowClasses.isEmpty()) {
+ visualRow.setAttribute(HTML.ATTR_CLASS, rowClasses.get(rci).toString());
+ rci++;
+ if (rci >= rowClasses.size()) {
+ rci = 0;
+ }
+ }
+ for (int j = 0; j < tableSize; j++) {
+ if (i * tableSize + j >= childrenCount) {
+ break;
+ }
+ nsIDOMElement visualCell = visualDocument.createElement(HTML.TAG_TD);
+ if (!columnClasses.isEmpty()) {
+ visualCell.setAttribute(HTML.ATTR_CLASS, columnClasses.get(cci).toString());
+ cci++;
+ if (cci >= columnClasses.size()) {
+ cci = 0;
+ }
+ }
+ visualRow.appendChild(visualCell);
+ /*
+ * https://jira.jboss.org/jira/browse/JBIDE-3373 Add odd
+ * facets elements to the first table cell
+ */
+ if (htmlFacetsElementsPresents && !htmlFacetsElementsRendered) {
+ VpeChildrenInfo childrenInfo = null;
+ if (captionHtmlElementsPresents) {
+ for (Node node : captionFacetChildren.get(VisualDomUtil.FACET_HTML_TAGS)) {
+ childrenInfo = new VpeChildrenInfo(visualCell);
+ childrenInfo.addSourceChild(node);
+ creatorInfo.addChildrenInfo(childrenInfo);
+ }
+ }
+ if (headerHtmlElementsPresents) {
+ for (Node node : headerFacetChildren.get(VisualDomUtil.FACET_HTML_TAGS)) {
+ childrenInfo = new VpeChildrenInfo(visualCell);
+ childrenInfo.addSourceChild(node);
+ creatorInfo.addChildrenInfo(childrenInfo);
+ }
+ }
+ if (footerHtmlElementsPresents) {
+ for (Node node : footerFacetChildren.get(VisualDomUtil.FACET_HTML_TAGS)) {
+ childrenInfo = new VpeChildrenInfo(visualCell);
+ childrenInfo.addSourceChild(node);
+ creatorInfo.addChildrenInfo(childrenInfo);
+ }
+ }
+ htmlFacetsElementsRendered = true;
+ } else {
+
+ int sourceIndex = tableSize * i + j;
+ if (sourceIndex < childrenCount) {
+ /*
+ * https://jira.jboss.org/jira/browse/JBIDE-3373
+ * Correct index when odd facets elements
+ * presents
+ */
+ if (htmlFacetsElementsPresents) {
+ sourceIndex = sourceIndex - 1;
+ }
+ Node child = sourceChildren[sourceIndex];
+ if (child != header && child != footer) {
+ VpeChildrenInfo childrenInfo = new VpeChildrenInfo(visualCell);
+ childrenInfo.addSourceChild(child);
+ creatorInfo.addChildrenInfo(childrenInfo);
+ }
+ }
+ }
+ }
+ if (visualBody != null) {
+ visualBody.appendChild(visualRow);
+ } else {
+ visualTable.appendChild(visualRow);
+ }
}
- nsIDOMElement visualCell = visualDocument.createElement(HTML.TAG_TD);
- if (columnClasses.size() > 0) {
- visualCell.setAttribute(HTML.ATTR_CLASS, columnClasses.get(
- cci).toString());
- cci++;
- if (cci >= columnClasses.size())
- cci = 0;
- }
- visualRow.appendChild(visualCell);
- /*
- * https://jira.jboss.org/jira/browse/JBIDE-3373
- * Add odd facets elements to the first table cell
- */
- if (htmlFacetsElementsPresents && !htmlFacetsElementsRendered) {
- VpeChildrenInfo childrenInfo = null;
- if (captionHtmlElementsPresents) {
- for (Node node : captionFacetChildren.get(VisualDomUtil.FACET_HTML_TAGS)) {
- childrenInfo = new VpeChildrenInfo(visualCell);
- childrenInfo.addSourceChild(node);
- creatorInfo.addChildrenInfo(childrenInfo);
- }
- }
- if (headerHtmlElementsPresents) {
- for (Node node : headerFacetChildren.get(VisualDomUtil.FACET_HTML_TAGS)) {
- childrenInfo = new VpeChildrenInfo(visualCell);
- childrenInfo.addSourceChild(node);
- creatorInfo.addChildrenInfo(childrenInfo);
- }
- }
- if (footerHtmlElementsPresents) {
- for (Node node : footerFacetChildren.get(VisualDomUtil.FACET_HTML_TAGS)) {
- childrenInfo = new VpeChildrenInfo(visualCell);
- childrenInfo.addSourceChild(node);
- creatorInfo.addChildrenInfo(childrenInfo);
- }
- }
- htmlFacetsElementsRendered = true;
- } else {
-
- int sourceIndex = tableSize * i + j;
- if (sourceIndex < childrenCount) {
- /*
- * https://jira.jboss.org/jira/browse/JBIDE-3373
- * Correct index when odd facets elements presents
- */
- if (htmlFacetsElementsPresents) {
- sourceIndex = sourceIndex-1;
- }
- Node child = sourceChildren[sourceIndex];
- if (child != header && child != footer) {
- VpeChildrenInfo childrenInfo = new VpeChildrenInfo(visualCell);
- childrenInfo.addSourceChild(child);
- creatorInfo.addChildrenInfo(childrenInfo);
- }
- }
- }
- }
- if (visualBody != null) {
- visualBody.appendChild(visualRow);
- } else {
- visualTable.appendChild(visualRow);
- }
- }
- makeSpecial(header, "header", visualHead, visualDocument, tableSize, //$NON-NLS-1$
- creatorInfo, HTML.TAG_TH, headerClassExpr, pageContext);
- makeSpecial(footer, "footer", visualFoot, visualDocument, tableSize, //$NON-NLS-1$
- creatorInfo, HTML.TAG_TD, footerClassExpr, pageContext);
+ makeSpecial(header, "header", visualHead, visualDocument, tableSize, //$NON-NLS-1$
+ creatorInfo, HTML.TAG_TH, headerClassExpr, pageContext);
+ makeSpecial(footer, "footer", visualFoot, visualDocument, tableSize, //$NON-NLS-1$
+ creatorInfo, HTML.TAG_TD, footerClassExpr, pageContext);
- for (int i = 0; i < propertyCreators.size(); i++) {
- VpeCreator creator = (VpeCreator) propertyCreators.get(i);
- if (creator != null) {
- VpeCreatorInfo info = creator.create(pageContext,
- sourceNode, visualDocument,
- visualTable, visualNodeMap);
- if (info != null && info.getVisualNode() != null) {
- nsIDOMAttr attr = (nsIDOMAttr) info.getVisualNode();
- if (attr.getValue().length() > 0) {
- visualTable.setAttributeNode(attr);
- }
+ for (int i = 0; i < propertyCreators.size(); i++) {
+ VpeCreator creator = (VpeCreator) propertyCreators.get(i);
+ if (creator != null) {
+ VpeCreatorInfo info = creator.create(pageContext, sourceNode, visualDocument, visualTable,
+ visualNodeMap);
+ if (info != null && info.getVisualNode() != null) {
+ nsIDOMAttr attr = (nsIDOMAttr) info.getVisualNode();
+ if (attr.getValue().length() > 0) {
+ visualTable.setAttributeNode(attr);
+ }
+ }
+ }
}
- }
}
- }
}
return creatorInfo;
}
- private void makeSpecial(Node facet, String facetName, nsIDOMElement visualHead,
- nsIDOMDocument visualDocument, int tableSize,
- VpeCreatorInfo creatorInfo, String cellTag,
- VpeExpression headerClassExpr, VpePageContext pageContext) throws VpeExpressionException {
+ private void makeSpecial(Node facet, String facetName, nsIDOMElement visualHead, nsIDOMDocument visualDocument,
+ int tableSize, VpeCreatorInfo creatorInfo, String cellTag, VpeExpression headerClassExpr,
+ VpePageContext pageContext) throws VpeExpressionException {
if (facet != null && visualHead != null) {
nsIDOMElement visualRow = visualDocument.createElement(HTML.TAG_TR);
visualHead.appendChild(visualRow);
nsIDOMElement visualCell = visualDocument.createElement(cellTag);
visualCell.setAttribute(HTML.ATTR_COLSPAN, "" + tableSize); //$NON-NLS-1$
if (headerClassExpr != null && facet.getParentNode() != null) {
- String headerClass = headerClassExpr.exec(pageContext,
- facet.getParentNode()).stringValue();
+ String headerClass = headerClassExpr.exec(pageContext, facet.getParentNode()).stringValue();
visualCell.setAttribute(HTML.ATTR_CLASS, headerClass);
}
visualRow.appendChild(visualCell);
@@ -470,13 +441,18 @@
return null;
}
- /* (non-Javadoc)
- * @see org.jboss.tools.vpe.editor.template.VpeAbstractCreator#isRecreateAtAttrChange(org.jboss.tools.vpe.editor.context.VpePageContext, org.w3c.dom.Element, org.mozilla.interfaces.nsIDOMDocument, org.mozilla.interfaces.nsIDOMNode, java.lang.Object, java.lang.String, java.lang.String)
+ /*
+ * (non-Javadoc)
+ *
+ * @see
+ * org.jboss.tools.vpe.editor.template.VpeAbstractCreator#isRecreateAtAttrChange
+ * (org.jboss.tools.vpe.editor.context.VpePageContext, org.w3c.dom.Element,
+ * org.mozilla.interfaces.nsIDOMDocument, org.mozilla.interfaces.nsIDOMNode,
+ * java.lang.Object, java.lang.String, java.lang.String)
*/
@Override
- public boolean isRecreateAtAttrChange(VpePageContext pageContext,
- Element sourceElement, nsIDOMDocument visualDocument,
- nsIDOMNode visualNode, Object data, String name, String value) {
+ public boolean isRecreateAtAttrChange(VpePageContext pageContext, Element sourceElement,
+ nsIDOMDocument visualDocument, nsIDOMNode visualNode, Object data, String name, String value) {
return true;
}
Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeStyleCreator.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeStyleCreator.java 2012-04-06 21:31:08 UTC (rev 40098)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeStyleCreator.java 2012-04-06 21:59:16 UTC (rev 40099)
@@ -46,7 +46,7 @@
text = VpeStyleUtil.removeAllCssComments(text);
List<String> imports = VpeStyleUtil.findCssImportConstruction(text, pageContext);
VpeVisualDomBuilder vvdb = pageContext.getVisualBuilder();
- if (imports.size() > 0) {
+ if (!imports.isEmpty()) {
for (String key : imports) {
/*
* Add inline <style> element for each found css @import.
Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/ZoomEventManager.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/ZoomEventManager.java 2012-04-06 21:31:08 UTC (rev 40098)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/ZoomEventManager.java 2012-04-06 21:59:16 UTC (rev 40099)
@@ -27,13 +27,13 @@
public class ZoomEventManager implements IZoomEventManager{
- private final float basicZoom = 1f;
- private final float minZoom = 0.3f;
- private final float maxZoom = 4f;
+ private static final float basicZoom = 1f;
+ private static final float minZoom = 0.3f;
+ private static final float maxZoom = 4f;
private float[] availableZoomValues;
private int currentZoomPos = 5;
- private final float decreaseValue = 0.14f;
- private final float increaseValue = 0.375f;
+ private static final float decreaseValue = 0.14f;
+ private static final float increaseValue = 0.375f;
private nsIMarkupDocumentViewer documentViewer;
public ZoomEventManager(XulRunnerEditor editor) {
13 years, 8 months
- 1
- 0
JBoss Tools SVN: r40098 - in trunk/maven/plugins/org.jboss.tools.maven.core/src/org/jboss/tools/maven/core: libprov and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: snjeza
Date: 2012-04-06 17:31:08 -0400 (Fri, 06 Apr 2012)
New Revision: 40098
Modified:
trunk/maven/plugins/org.jboss.tools.maven.core/src/org/jboss/tools/maven/core/MavenCoreActivator.java
trunk/maven/plugins/org.jboss.tools.maven.core/src/org/jboss/tools/maven/core/libprov/MavenLibraryProviderInstallOperation.java
Log:
JBIDE-11496 - Customized Maven libraries not persisted correctly
Modified: trunk/maven/plugins/org.jboss.tools.maven.core/src/org/jboss/tools/maven/core/MavenCoreActivator.java
===================================================================
--- trunk/maven/plugins/org.jboss.tools.maven.core/src/org/jboss/tools/maven/core/MavenCoreActivator.java 2012-04-06 20:59:31 UTC (rev 40097)
+++ trunk/maven/plugins/org.jboss.tools.maven.core/src/org/jboss/tools/maven/core/MavenCoreActivator.java 2012-04-06 21:31:08 UTC (rev 40098)
@@ -683,7 +683,7 @@
}
}
- private static void copy(InputStream is, OutputStream os)
+ public static void copy(InputStream is, OutputStream os)
throws IOException {
byte[] buffer = new byte[1024];
int count;
@@ -745,4 +745,5 @@
IMavenConstants.PLUGIN_ID, -1, msg, ex));
}
}
+
}
Modified: trunk/maven/plugins/org.jboss.tools.maven.core/src/org/jboss/tools/maven/core/libprov/MavenLibraryProviderInstallOperation.java
===================================================================
--- trunk/maven/plugins/org.jboss.tools.maven.core/src/org/jboss/tools/maven/core/libprov/MavenLibraryProviderInstallOperation.java 2012-04-06 20:59:31 UTC (rev 40097)
+++ trunk/maven/plugins/org.jboss.tools.maven.core/src/org/jboss/tools/maven/core/libprov/MavenLibraryProviderInstallOperation.java 2012-04-06 21:31:08 UTC (rev 40098)
@@ -10,33 +10,54 @@
************************************************************************************/
package org.jboss.tools.maven.core.libprov;
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
import java.io.File;
-import java.io.FileWriter;
+import java.io.FileOutputStream;
import java.io.IOException;
-import java.net.URL;
+import java.io.InputStream;
+import java.io.OutputStream;
import java.util.HashMap;
+import java.util.List;
import java.util.Map;
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.transform.OutputKeys;
+import javax.xml.transform.Transformer;
+import javax.xml.transform.TransformerFactory;
+import javax.xml.transform.dom.DOMSource;
+import javax.xml.transform.stream.StreamResult;
+
import org.eclipse.core.resources.IFile;
import org.eclipse.core.resources.IProject;
import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.FileLocator;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.Status;
+import org.eclipse.emf.common.util.EList;
import org.eclipse.emf.common.util.URI;
import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.ecore.resource.URIConverter;
import org.eclipse.emf.ecore.xmi.XMIResource;
import org.eclipse.jst.common.project.facet.core.libprov.ILibraryProvider;
import org.eclipse.jst.common.project.facet.core.libprov.LibraryProviderOperation;
import org.eclipse.jst.common.project.facet.core.libprov.LibraryProviderOperationConfig;
+import org.eclipse.m2e.core.embedder.IMaven;
import org.eclipse.m2e.core.internal.IMavenConstants;
+import org.eclipse.m2e.core.internal.MavenPluginActivator;
+import org.eclipse.m2e.model.edit.pom.Dependency;
+import org.eclipse.m2e.model.edit.pom.Exclusion;
import org.eclipse.m2e.model.edit.pom.Model;
+import org.eclipse.m2e.model.edit.pom.Repository;
+import org.eclipse.m2e.model.edit.pom.RepositoryPolicy;
import org.eclipse.m2e.model.edit.pom.util.PomResourceFactoryImpl;
import org.eclipse.m2e.model.edit.pom.util.PomResourceImpl;
import org.eclipse.wst.common.project.facet.core.IFacetedProjectBase;
import org.jboss.tools.maven.core.MavenCoreActivator;
+import org.w3c.dom.Attr;
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+import org.w3c.dom.NamedNodeMap;
/**
* @author snjeza
@@ -73,53 +94,153 @@
}
ILibraryProvider provider = config.getLibraryProvider();
File providerFile = MavenCoreActivator.getProviderFile(provider);
- URL url = null;
- PomResourceImpl libraryResource = null;
- URIConverter.WriteableOutputStream uws = null;
- FileWriter fw = null;
- try {
- Map<String, String> params = provider.getParams();
- String pomURLString = params.get("template"); //$NON-NLS-1$
- URL platformURL = new URL(pomURLString);
- url = FileLocator.resolve(platformURL);
-
- libraryResource = MavenCoreActivator.loadResource(url);
- libraryResource.getContents().clear();
- libraryResource.getContents().add(libraryModel);
+ savePomModel(providerFile, libraryModel);
+ } else {
+ MavenCoreActivator.addLibraryProviderOperationConfig(config);
+ }
+ }
- Map<String, String> options = new HashMap<String, String>();
- options.put(XMIResource.OPTION_ENCODING,
- MavenCoreActivator.ENCODING);
- fw = new FileWriter(providerFile);
- uws = new URIConverter.WriteableOutputStream(
- fw, MavenCoreActivator.ENCODING);
- libraryResource.save(uws, options);
- } catch (IOException e) {
+ private void savePomModel(File file, Model pomModel) throws CoreException {
+ org.apache.maven.model.Model model = new org.apache.maven.model.Model();
+ model.setModelVersion("4.0.0"); //$NON-NLS-1$
+
+ model.setGroupId(pomModel.getArtifactId());
+ model.setArtifactId(pomModel.getArtifactId());
+ model.setVersion(pomModel.getVersion());
+ model.setPackaging(pomModel.getPackaging());
+
+ if(pomModel.getName() != null && pomModel.getName().length() > 0) {
+ model.setName(pomModel.getName());
+ }
+ if(pomModel.getDescription() != null && pomModel.getDescription().length() > 0) {
+ model.setDescription(pomModel.getDescription());
+ }
+ EList<Dependency> pomDependencies = pomModel.getDependencies();
+ List<org.apache.maven.model.Dependency> dependencies = model.getDependencies();
+ for (Dependency pomDependency:pomDependencies) {
+ org.apache.maven.model.Dependency dependency = new org.apache.maven.model.Dependency();
+ dependency.setArtifactId(pomDependency.getArtifactId());
+ dependency.setGroupId(pomDependency.getGroupId());
+ dependency.setVersion(pomDependency.getVersion());
+ dependency.setType(pomDependency.getType());
+ dependency.setScope(pomDependency.getScope());
+ dependency.setClassifier(pomDependency.getClassifier());
+ dependency.setOptional(pomDependency.getOptional());
+ dependency.setSystemPath(pomDependency.getSystemPath());
+ EList<Exclusion> pomExclusions = pomDependency.getExclusions();
+ List<org.apache.maven.model.Exclusion> exclusions = dependency.getExclusions();
+ for (Exclusion pomExclusion:pomExclusions) {
+ org.apache.maven.model.Exclusion exclusion = new org.apache.maven.model.Exclusion();
+ exclusion.setGroupId(pomExclusion.getGroupId());
+ exclusion.setArtifactId(pomExclusion.getArtifactId());
+ exclusions.add(exclusion);
+ }
+ dependencies.add(dependency);
+ }
+ EList<Repository> pomRepositories = pomModel.getRepositories();
+ List<org.apache.maven.model.Repository> repositories = model.getRepositories();
+ for (Repository pomRepository:pomRepositories) {
+ org.apache.maven.model.Repository repository = new org.apache.maven.model.Repository();
+ repository.setId(pomRepository.getId());
+ repository.setLayout(pomRepository.getLayout());
+ repository.setName(pomRepository.getName());
+ RepositoryPolicy pomReleases = pomRepository.getReleases();
+ repository.setReleases(getRepositoryPolicy(pomReleases));
+ RepositoryPolicy pomSnapshots = pomRepository.getSnapshots();
+ repository.setSnapshots(getRepositoryPolicy(pomSnapshots));
+ repository.setLayout(pomRepository.getLayout());
+ repository.setUrl(pomRepository.getUrl());
+ repositories.add(repository);
+ }
+ createMavenModel(file, model);
+ }
+
+ public void createMavenModel(File file, org.apache.maven.model.Model model) throws CoreException {
+
+ try {
+ ByteArrayOutputStream buf = new ByteArrayOutputStream();
+
+ IMaven maven = MavenPluginActivator.getDefault().getMaven();
+ maven.writeModel(model, buf);
+
+ DocumentBuilderFactory documentBuilderFactory = DocumentBuilderFactory.newInstance();
+ documentBuilderFactory.setNamespaceAware(false);
+ DocumentBuilder documentBuilder = documentBuilderFactory.newDocumentBuilder();
+
+ Document document = documentBuilder.parse(new ByteArrayInputStream(buf.toByteArray()));
+ Element documentElement = document.getDocumentElement();
+
+ NamedNodeMap attributes = documentElement.getAttributes();
+
+ if(attributes == null || attributes.getNamedItem("xmlns") == null) { //$NON-NLS-1$
+ Attr attr = document.createAttribute("xmlns"); //$NON-NLS-1$
+ attr.setTextContent("http://maven.apache.org/POM/4.0.0"); //$NON-NLS-1$
+ documentElement.setAttributeNode(attr);
+ }
+
+ if(attributes == null || attributes.getNamedItem("xmlns:xsi") == null) { //$NON-NLS-1$
+ Attr attr = document.createAttribute("xmlns:xsi"); //$NON-NLS-1$
+ attr.setTextContent("http://www.w3.org/2001/XMLSchema-instance"); //$NON-NLS-1$
+ documentElement.setAttributeNode(attr);
+ }
+
+ if(attributes == null || attributes.getNamedItem("xsi:schemaLocation") == null) { //$NON-NLS-1$
+ Attr attr = document.createAttributeNS("http://www.w3.org/2001/XMLSchema-instance", "xsi:schemaLocation"); //$NON-NLS-1$ //$NON-NLS-2$
+ attr.setTextContent("http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"); //$NON-NLS-1$
+ documentElement.setAttributeNode(attr);
+ }
+
+ TransformerFactory transfac = TransformerFactory.newInstance();
+ Transformer trans = transfac.newTransformer();
+ trans.setOutputProperty(OutputKeys.OMIT_XML_DECLARATION, "yes"); //$NON-NLS-1$
+
+ buf.reset();
+ trans.transform(new DOMSource(document), new StreamResult(buf));
+
+ OutputStream os = null;
+ InputStream is = null;
+ try {
+ os = new FileOutputStream(file);
+ is = new ByteArrayInputStream(buf.toByteArray());
+ MavenCoreActivator.copy(is, os);
+ } catch (Exception e) {
MavenCoreActivator.log(e);
+ throw new CoreException(new Status(IStatus.ERROR,
+ MavenCoreActivator.PLUGIN_ID, -1, e.getMessage(), e));
} finally {
- if (uws != null) {
+ if (is != null) {
try {
- uws.flush();
- uws.close();
- } catch (IOException e) {
- MavenCoreActivator.log(e);
- }
+ is.close();
+ } catch (Exception ignore) {}
}
- if (fw != null) {
+ if (os != null) {
try {
- fw.close();
- } catch (IOException e) {
- MavenCoreActivator.log(e);
- }
+ os.close();
+ } catch (Exception ignore) {}
}
- if (libraryResource != null) {
- libraryResource.unload();
- }
}
-
- } else {
- MavenCoreActivator.addLibraryProviderOperationConfig(config);
+
+ } catch (RuntimeException ex) {
+ String msg = "Can't create model " + file.getAbsolutePath();
+ throw new CoreException(new Status(IStatus.ERROR,
+ MavenCoreActivator.PLUGIN_ID, -1, msg, ex));
+ } catch (Exception ex) {
+ String msg = "Can't create model " + file.getAbsolutePath();
+ throw new CoreException(new Status(IStatus.ERROR,
+ MavenCoreActivator.PLUGIN_ID, -1, msg, ex));
}
+ }
+
+ private org.apache.maven.model.RepositoryPolicy getRepositoryPolicy(
+ RepositoryPolicy pomRepositoryPolicy) {
+ if (pomRepositoryPolicy == null) {
+ return null;
+ }
+ org.apache.maven.model.RepositoryPolicy repositoryPolicy = new org.apache.maven.model.RepositoryPolicy();
+ repositoryPolicy.setChecksumPolicy(pomRepositoryPolicy.getChecksumPolicy());
+ repositoryPolicy.setEnabled(pomRepositoryPolicy.getEnabled());
+ repositoryPolicy.setUpdatePolicy(pomRepositoryPolicy.getUpdatePolicy());
+ return repositoryPolicy;
}
public static PomResourceImpl loadResource(IFile pomFile)
13 years, 8 months
- 1
- 0
JBoss Tools SVN: r40097 - trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2012-04-06 16:59:31 -0400 (Fri, 06 Apr 2012)
New Revision: 40097
Modified:
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeAbstractBodyTemplate.java
Log:
removed empty catch block for XPCOMException and verified the JBIDE-1568 works as expected without catching the exception
Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeAbstractBodyTemplate.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeAbstractBodyTemplate.java 2012-04-06 20:28:00 UTC (rev 40096)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeAbstractBodyTemplate.java 2012-04-06 20:59:31 UTC (rev 40097)
@@ -73,12 +73,7 @@
*/
div.setAttribute(targetAttributeName, attributeValue);
}
- //FIX FOR JBIDE-1568, added by Max Areshkau
- try {
- body.setAttribute(targetAttributeName, attributeValue);
- } catch(XPCOMException ex ) {
- // Ignored
- }
+ body.setAttribute(targetAttributeName, attributeValue);
}
}
}
13 years, 8 months
- 1
- 0
JBoss Tools SVN: r40096 - in trunk: forge/tests/org.jboss.tools.forge.ui.bot.test and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2012-04-06 16:28:00 -0400 (Fri, 06 Apr 2012)
New Revision: 40096
Modified:
trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/pom.xml
trunk/forge/tests/org.jboss.tools.forge.ui.bot.test/pom.xml
Log:
If you need bot tests to be executed add
-Dswtbot.test.skip=false
in hudson configuration. ui bot tests are extreamly slow comparing to regular JUnit tests, that's why there is a key to control their inclusion in tests
Modified: trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/pom.xml
===================================================================
--- trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/pom.xml 2012-04-06 19:51:26 UTC (rev 40095)
+++ trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/pom.xml 2012-04-06 20:28:00 UTC (rev 40096)
@@ -25,7 +25,7 @@
<artifactId>tycho-surefire-plugin</artifactId>
<configuration>
<useUIThread>false</useUIThread>
- <!-- <skip>${swtbot.test.skip}</skip> -->
+ <skip>${swtbot.test.skip}</skip>
<testSuite>org.jboss.tools.esb.ui.bot.test</testSuite>
<testClass>org.jboss.tools.esb.ui.bot.tests.ESBAllBotTests</testClass>
</configuration>
Modified: trunk/forge/tests/org.jboss.tools.forge.ui.bot.test/pom.xml
===================================================================
--- trunk/forge/tests/org.jboss.tools.forge.ui.bot.test/pom.xml 2012-04-06 19:51:26 UTC (rev 40095)
+++ trunk/forge/tests/org.jboss.tools.forge.ui.bot.test/pom.xml 2012-04-06 20:28:00 UTC (rev 40096)
@@ -19,6 +19,7 @@
<artifactId>tycho-surefire-plugin</artifactId>
<configuration>
<useUIThread>false</useUIThread>
+ <skip>${swtbot.test.skip}</skip>
<testSuite>org.jboss.tools.forge.ui.bot.test</testSuite>
<testClass>org.jboss.tools.forge.ui.bot.test.suite.ForgeAllTest</testClass>
</configuration>
13 years, 8 months
- 1
- 0
JBoss Tools SVN: r40095 - in trunk/seam/plugins/org.jboss.tools.seam.core: META-INF and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: akazakov
Date: 2012-04-06 15:51:26 -0400 (Fri, 06 Apr 2012)
New Revision: 40095
Modified:
trunk/seam/plugins/org.jboss.tools.seam.core/META-INF/MANIFEST.MF
trunk/seam/plugins/org.jboss.tools.seam.core/plugin.xml
Log:
https://issues.jboss.org/browse/JBIDE-11500 Update JSF requirements to 2.0 for Seam 2.3 facet
Modified: trunk/seam/plugins/org.jboss.tools.seam.core/META-INF/MANIFEST.MF
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.core/META-INF/MANIFEST.MF 2012-04-06 17:19:36 UTC (rev 40094)
+++ trunk/seam/plugins/org.jboss.tools.seam.core/META-INF/MANIFEST.MF 2012-04-06 19:51:26 UTC (rev 40095)
@@ -39,7 +39,8 @@
org.eclipse.jem.util;bundle-version="2.1.2",
org.eclipse.debug.core;bundle-version="3.7.0",
org.jboss.tools.common.validation,
- org.jboss.tools.common.ui
+ org.jboss.tools.common.ui,
+ org.eclipse.jst.jsf.facelet.core;bundle-version="1.0.100"
Bundle-Version: 3.3.0.qualifier
Export-Package:
org.jboss.tools.seam.core,
Modified: trunk/seam/plugins/org.jboss.tools.seam.core/plugin.xml
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.core/plugin.xml 2012-04-06 17:19:36 UTC (rev 40094)
+++ trunk/seam/plugins/org.jboss.tools.seam.core/plugin.xml 2012-04-06 19:51:26 UTC (rev 40095)
@@ -185,7 +185,7 @@
</requires>
<requires
facet="jst.jsf"
- version="[1.2">
+ version="[2.0">
</requires>
<requires
facet="jst.java"
@@ -395,7 +395,7 @@
<label>Dynamic Web Project with Seam 2.3 (Technical Preview)</label>
<facet id="jst.java" version="5.0"/>
<facet id="jst.web" version="2.5"/>
- <facet id="jst.jsf" version="1.2"/>
+ <facet id="jst.jsf" version="2.0"/>
<facet id="jst.seam" version="2.3"/>
<description>
Configures a Dynamic Web application to use Seam v2.3 (Technical Preview)
13 years, 8 months
- 1
- 0
JBoss Tools SVN: r40094 - trunk/documentation/movies.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2012-04-06 13:19:36 -0400 (Fri, 06 Apr 2012)
New Revision: 40094
Modified:
trunk/documentation/movies/index.html
Log:
fix missing title tag; relabel footer link to archives; fix centering & margins so it looks good on FF, Konq, and Chrome (lin64)
Modified: trunk/documentation/movies/index.html
===================================================================
--- trunk/documentation/movies/index.html 2012-04-06 14:12:22 UTC (rev 40093)
+++ trunk/documentation/movies/index.html 2012-04-06 17:19:36 UTC (rev 40094)
@@ -1,6 +1,7 @@
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
+ <title>JBoss Tools - Video Tutorials</title>
<link rel="stylesheet" href="css/movies.css" type="text/css"/>
@@ -26,52 +27,42 @@
<body>
-<div class="book">
+<div class="book" style="align:center; margin-left:30px;">
-<h1><img
- src="images/community/jbosstools_horiz_450.png"/></h1>
- <h2 align="center">Video Tutorials</h2>
+ <br/> <p>       <img border="0" src="images/community/jbosstools_horiz_450.png"/></p>
+ <h2 style="margin-left:150px">Video Tutorials</h2>
-<div id="player">
- <center>
- <iframe src="http://player.vimeo.com/video/39743315?portrait=0"
- width="480" height="324" frameborder="0" webkitAllowFullScreen
- mozallowfullscreen allowFullScreen></iframe>
- </center>
-</div>
+ <div id="player"> <iframe src="http://player.vimeo.com/video/39743315?portrait=0" width="480" height="324" frameborder="0" webkitAllowFullScreen mozallowfullscreen allowFullScreen></iframe> </div>
-<br/>
-<div id="directory">
- <h2>Installation</h2>
+ <br/>
+ <div id="directory" align="left">
+ <h2>Installation</h2>
- <ul class="multicolumns">
- <li class="videoListItem"><a class="videocontrol" href="http://player.vimeo.com/video/39743315?portrait=0">Eclipse Marketplace</a> </li>
- <li class="videoListItem"> <a class="videocontrol" href="http://player.vimeo.com/video/39606090?portrait=0">Developer Studio</a></li>
- </ul>
+ <ul class="multicolumns">
+ <li class="videoListItem"><a class="videocontrol" href="http://player.vimeo.com/video/39743315?portrait=0">Eclipse Marketplace</a> </li>
+ <li class="videoListItem"> <a class="videocontrol" href="http://player.vimeo.com/video/39606090?portrait=0">Developer Studio</a></li>
+ </ul>
- <h2>Technology Introductions</h2>
+ <h2>Technology Introductions</h2>
- <ul class="multicolumns">
- <li class="videoListItem"> <a class="videocontrol" href="http://player.vimeo.com/video/39607154?portrait=0">Java EE 6 + Arquillian</a></li>
- <li class="videoListItem"> <a class="videocontrol" href="http://player.vimeo.com/video/39607711?portrait=0">Richfaces 4 Desktop & Mobile</a></li>
- <li class="videoListItem"> <a class="videocontrol" href="http://player.vimeo.com/video/39608223?portrait=0">Forge</a></li>
- <li class="videoListItem"> <a class="videocontrol" href="http://player.vimeo.com/video/39743919?portrait=0">Google Web Toolkit</a></li>
- </ul>
+ <ul class="multicolumns">
+ <li class="videoListItem"> <a class="videocontrol" href="http://player.vimeo.com/video/39607154?portrait=0">Java EE 6 + Arquillian</a></li>
+ <li class="videoListItem"> <a class="videocontrol" href="http://player.vimeo.com/video/39607711?portrait=0">Richfaces 4 Desktop & Mobile</a></li>
+ <li class="videoListItem"> <a class="videocontrol" href="http://player.vimeo.com/video/39608223?portrait=0">Forge</a></li>
+ <li class="videoListItem"> <a class="videocontrol" href="http://player.vimeo.com/video/39743919?portrait=0">Google Web Toolkit</a></li>
+ </ul>
- <h2>Reverse Engineering/CRUD Generation</h2>
+ <h2>Reverse Engineering/CRUD Generation</h2>
- <ul class="multicolumns">
- <li class="videoListItem"> <a class="videocontrol" href="http://player.vimeo.com/video/39608294?portrait=0">Hibernate Tools Reverse Engineering</a></li>
- <li class="videoListItem"> <a class="videocontrol" href="http://player.vimeo.com/video/39608326?portrait=0">Forge Reverse Engineering</a></li>
- </h2>
+ <ul class="multicolumns">
+ <li class="videoListItem"> <a class="videocontrol" href="http://player.vimeo.com/video/39608294?portrait=0">Hibernate Tools Reverse Engineering</a></li>
+ <li class="videoListItem"> <a class="videocontrol" href="http://player.vimeo.com/video/39608326?portrait=0">Forge Reverse Engineering</a></li>
+ </h2>
-</div>
-<div>
+ </div>
- <br/><br/>
-<p>Looking for a different video ? Try look in our <a
- href="../archive/movies">archive</a></p>
- </div>
+ <br/><p><a href="../archive/movies">More videos available in our archive</a>.</p>
</div>
+
</body>
-</html>
\ No newline at end of file
+</html>
13 years, 8 months
- 1
- 0
JBoss Tools SVN: r40093 - in trunk/hibernatetools/plugins: org.jboss.tools.hibernate3_6/src/org/jboss/tools/hibernate3_6 and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: dgeraskov
Date: 2012-04-06 10:12:22 -0400 (Fri, 06 Apr 2012)
New Revision: 40093
Modified:
trunk/hibernatetools/plugins/org.jboss.tools.hibernate3_5/src/org/jboss/tools/hibernate3_5/HQLQueryPage.java
trunk/hibernatetools/plugins/org.jboss.tools.hibernate3_6/src/org/jboss/tools/hibernate3_6/HQLQueryPage.java
trunk/hibernatetools/plugins/org.jboss.tools.hibernate4_0/src/org/jboss/tools/hibernate4_0/HQLQueryPage.java
Log:
https://issues.jboss.org/browse/JBIDE-11372
Replace tab with space
Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate3_5/src/org/jboss/tools/hibernate3_5/HQLQueryPage.java
===================================================================
--- trunk/hibernatetools/plugins/org.jboss.tools.hibernate3_5/src/org/jboss/tools/hibernate3_5/HQLQueryPage.java 2012-04-06 12:20:08 UTC (rev 40092)
+++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate3_5/src/org/jboss/tools/hibernate3_5/HQLQueryPage.java 2012-04-06 14:12:22 UTC (rev 40093)
@@ -109,7 +109,7 @@
public HQLQueryPage(HibernateExtension extension, String string, QueryInputModel model) {
super(extension, model);
queryString = string;
- setTabName(getQueryString().replace('\n', ' ').replace('\r', ' '));
+ setTabName(getQueryString().replace('\n', ' ').replace('\r', ' ').replace('\t', ' '));
}
public void setSession(Session s) {
Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate3_6/src/org/jboss/tools/hibernate3_6/HQLQueryPage.java
===================================================================
--- trunk/hibernatetools/plugins/org.jboss.tools.hibernate3_6/src/org/jboss/tools/hibernate3_6/HQLQueryPage.java 2012-04-06 12:20:08 UTC (rev 40092)
+++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate3_6/src/org/jboss/tools/hibernate3_6/HQLQueryPage.java 2012-04-06 14:12:22 UTC (rev 40093)
@@ -109,7 +109,7 @@
public HQLQueryPage(HibernateExtension extension, String string, QueryInputModel model) {
super(extension, model);
queryString = string;
- setTabName(getQueryString().replace('\n', ' ').replace('\r', ' '));
+ setTabName(getQueryString().replace('\n', ' ').replace('\r', ' ').replace('\t', ' '));
}
public void setSession(Session s) {
Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate4_0/src/org/jboss/tools/hibernate4_0/HQLQueryPage.java
===================================================================
--- trunk/hibernatetools/plugins/org.jboss.tools.hibernate4_0/src/org/jboss/tools/hibernate4_0/HQLQueryPage.java 2012-04-06 12:20:08 UTC (rev 40092)
+++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate4_0/src/org/jboss/tools/hibernate4_0/HQLQueryPage.java 2012-04-06 14:12:22 UTC (rev 40093)
@@ -109,7 +109,7 @@
public HQLQueryPage(HibernateExtension extension, String string, QueryInputModel model) {
super(extension, model);
queryString = string;
- setTabName(getQueryString().replace('\n', ' ').replace('\r', ' '));
+ setTabName(getQueryString().replace('\n', ' ').replace('\r', ' ').replace('\t', ' '));
}
public void setSession(Session s) {
13 years, 8 months
- 1
- 0
JBoss Tools SVN: r40092 - trunk/openshift/tests/org.jboss.tools.openshift.ui.bot.test.
by jbosstools-commits＠lists.jboss.org
Author: sbunciak
Date: 2012-04-06 08:20:08 -0400 (Fri, 06 Apr 2012)
New Revision: 40092
Modified:
trunk/openshift/tests/org.jboss.tools.openshift.ui.bot.test/pom.xml
Log:
removed AS dependency
Modified: trunk/openshift/tests/org.jboss.tools.openshift.ui.bot.test/pom.xml
===================================================================
--- trunk/openshift/tests/org.jboss.tools.openshift.ui.bot.test/pom.xml 2012-04-06 09:06:29 UTC (rev 40091)
+++ trunk/openshift/tests/org.jboss.tools.openshift.ui.bot.test/pom.xml 2012-04-06 12:20:08 UTC (rev 40092)
@@ -36,11 +36,6 @@
<artifactId>org.jboss.tools.openshift.express.feature.feature.group</artifactId>
<version>2.3.0</version>
</dependency>
- <dependency>
- <type>p2-installable-unit</type>
- <artifactId>org.jboss.tools.as.feature.feature.group</artifactId>
- <version>2.3.0</version>
- </dependency>
</dependencies>
</configuration>
</plugin>
13 years, 8 months
- 1
- 0
JBoss Tools SVN: r40091 - in trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/src/org/jboss/tools/hb/ui/bot: test/generation and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: jpeterka
Date: 2012-04-06 05:06:29 -0400 (Fri, 06 Apr 2012)
New Revision: 40091
Added:
trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/src/org/jboss/tools/hb/ui/bot/test/generation/RunSchemaExportTest.java
Modified:
trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/src/org/jboss/tools/hb/ui/bot/suite/CodeGenerationSuite.java
Log:
Initial RunSchemaExport test added into hb ui bot test
Modified: trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/src/org/jboss/tools/hb/ui/bot/suite/CodeGenerationSuite.java
===================================================================
--- trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/src/org/jboss/tools/hb/ui/bot/suite/CodeGenerationSuite.java 2012-04-06 06:17:44 UTC (rev 40090)
+++ trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/src/org/jboss/tools/hb/ui/bot/suite/CodeGenerationSuite.java 2012-04-06 09:06:29 UTC (rev 40091)
@@ -1,8 +1,6 @@
package org.jboss.tools.hb.ui.bot.suite;
-import org.jboss.tools.hb.ui.bot.test.generation.CreateCodeGenerationConfiguration;
-import org.jboss.tools.hb.ui.bot.test.generation.JPADDLGenerationTest;
-import org.jboss.tools.hb.ui.bot.test.generation.JPAEntitiesGenerationTest;
+import org.jboss.tools.hb.ui.bot.test.generation.RunSchemaExportTest;
import org.jboss.tools.ui.bot.ext.RequirementAwareSuite;
import org.junit.runner.RunWith;
import org.junit.runners.Suite.SuiteClasses;
@@ -11,7 +9,8 @@
//(a)SuiteClasses({CreateCodeGenerationConfiguration.class})
//(a)SuiteClasses({JPADDLGenerationTest.class})
//(a)SuiteClasses({JPAEntitiesGenerationTest.class})
-(a)SuiteClasses({CreateCodeGenerationConfiguration.class,JPADDLGenerationTest.class,JPAEntitiesGenerationTest.class})
+(a)SuiteClasses({RunSchemaExportTest.class})
+//(a)SuiteClasses({CreateCodeGenerationConfiguration.class,JPADDLGenerationTest.class,JPAEntitiesGenerationTest.class})
public class CodeGenerationSuite {
}
Added: trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/src/org/jboss/tools/hb/ui/bot/test/generation/RunSchemaExportTest.java
===================================================================
--- trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/src/org/jboss/tools/hb/ui/bot/test/generation/RunSchemaExportTest.java (rev 0)
+++ trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/src/org/jboss/tools/hb/ui/bot/test/generation/RunSchemaExportTest.java 2012-04-06 09:06:29 UTC (rev 40091)
@@ -0,0 +1,52 @@
+package org.jboss.tools.hb.ui.bot.test.generation;
+
+import static org.eclipse.swtbot.swt.finder.waits.Conditions.shellCloses;
+import static org.eclipse.swtbot.swt.finder.waits.Conditions.shellIsActive;
+
+import org.eclipse.swtbot.eclipse.finder.widgets.SWTBotView;
+import org.eclipse.swtbot.swt.finder.widgets.SWTBotShell;
+import org.eclipse.swtbot.swt.finder.widgets.SWTBotTreeItem;
+import org.jboss.tools.hb.ui.bot.common.Tree;
+import org.jboss.tools.hb.ui.bot.test.HibernateBaseTest;
+import org.jboss.tools.ui.bot.ext.config.Annotations.DB;
+import org.jboss.tools.ui.bot.ext.config.Annotations.Require;
+import org.jboss.tools.ui.bot.ext.gen.ActionItem;
+import org.jboss.tools.ui.bot.ext.types.IDELabel;
+import org.junit.Test;
+
+/**
+ * Run schema export from hibernate configuration context menu test
+ *
+ * @author jpeterka
+ *
+ */
+@Require(db = @DB, clearProjects = true, perspective = "Hibernate")
+public class RunSchemaExportTest extends HibernateBaseTest {
+
+
+ final String hc = "pre-hibernate40";
+
+ @Test
+ public void showMappingDiagram() {
+ importTestProject("/resources/prj/hibernatelib");
+ importTestProject("/resources/prj/hibernate40");
+ util.waitForAll();
+ runShemaExport();
+ }
+
+ private void runShemaExport() {
+ SWTBotView hcv = open.viewOpen(ActionItem.View.HibernateHibernateConfigurations.LABEL);
+ Tree.select(hcv.bot(), hc, "Configuration");
+ SWTBotTreeItem item = Tree.select(hcv.bot(), hc);
+ item.contextMenu("Run SchemaExport").click();
+
+ String title = "Run SchemaExport";
+ bot.waitUntil(shellIsActive(title ));
+ SWTBotShell shell = bot.shell(title);
+ shell.bot().button(IDELabel.Button.YES).click();
+ bot.waitUntil(shellCloses(shell));
+
+ //SWTBotTreeItem selectNode = ConsoleConfiguration.selectNode(hc,"Configuration","Database","Public");
+ //assertTrue(selectNode.getNodes().size() != 0);
+ }
+}
Property changes on: trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/src/org/jboss/tools/hb/ui/bot/test/generation/RunSchemaExportTest.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
13 years, 8 months
- 1
- 0