JBoss Tools SVN: r43219 - in trunk/hibernatetools/plugins: org.jboss.tools.hibernate.jpt.ui/src/org/jboss/tools/hibernate/jpt/ui/internal/persistence/details and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: dgeraskov
Date: 2012-08-24 08:56:23 -0400 (Fri, 24 Aug 2012)
New Revision: 43219
Modified:
trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/utils/DialogSelectionHelper.java
trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jboss/tools/hibernate/jpt/ui/internal/persistence/details/HibernatePersistenceUnitClassesComposite.java
Log:
Mode package selection dialog to DialogSelectionHelper class
Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/utils/DialogSelectionHelper.java
===================================================================
--- trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/utils/DialogSelectionHelper.java 2012-08-24 12:54:41 UTC (rev 43218)
+++ trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/utils/DialogSelectionHelper.java 2012-08-24 12:56:23 UTC (rev 43219)
@@ -23,21 +23,28 @@
import org.eclipse.core.resources.ResourcesPlugin;
import org.eclipse.debug.internal.ui.stringsubstitution.StringVariableLabelProvider;
+import org.eclipse.jdt.core.IJavaElement;
import org.eclipse.jdt.core.IJavaProject;
+import org.eclipse.jdt.core.IPackageFragment;
import org.eclipse.jdt.core.IType;
import org.eclipse.jdt.core.JavaCore;
import org.eclipse.jdt.core.JavaModelException;
import org.eclipse.jdt.core.search.IJavaSearchScope;
import org.eclipse.jdt.core.search.SearchEngine;
+import org.eclipse.jdt.internal.ui.dialogs.PackageSelectionDialog;
+import org.eclipse.jdt.internal.ui.util.BusyIndicatorRunnableContext;
import org.eclipse.jdt.ui.IJavaElementSearchConstants;
import org.eclipse.jdt.ui.JavaElementLabelProvider;
import org.eclipse.jdt.ui.JavaUI;
import org.eclipse.jface.dialogs.IDialogConstants;
+import org.eclipse.jface.viewers.IFilter;
import org.eclipse.jface.viewers.ILabelProvider;
import org.eclipse.jface.window.Window;
+import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Shell;
import org.eclipse.ui.PlatformUI;
import org.eclipse.ui.dialogs.ElementListSelectionDialog;
+import org.eclipse.ui.dialogs.FilteredList;
import org.eclipse.ui.dialogs.SelectionDialog;
import org.hibernate.eclipse.console.HibernateConsolePlugin;
@@ -130,5 +137,49 @@
}
return null;
}
+
+ public static IPackageFragment choosePackage(Shell shell, IJavaElement[] javaProjects, final IFilter filter, String title, String message){
+ BusyIndicatorRunnableContext context = new BusyIndicatorRunnableContext();
+ IJavaSearchScope scope = SearchEngine
+ .createJavaSearchScope(javaProjects, IJavaSearchScope.SOURCES
+ | IJavaSearchScope.REFERENCED_PROJECTS);
+ PackageSelectionDialog packageSelectionDialog = new PackageSelectionDialog(
+ shell, context,
+ PackageSelectionDialog.F_HIDE_DEFAULT_PACKAGE
+ | PackageSelectionDialog.F_HIDE_EMPTY_INNER, scope) {
+
+ @Override
+ protected FilteredList createFilteredList(Composite parent) {
+ FilteredList list = super.createFilteredList(parent);
+ if (filter != null){
+ list.setFilterMatcher(new FilteredList.FilterMatcher() {
+
+ @Override
+ public void setFilter(String pattern, boolean ignoreCase,
+ boolean ignoreWildCards) {
+ }
+
+ @Override
+ public boolean match(Object element) {
+ return filter.select(element);
+ }
+ }
+ );
+ }
+ return list;
+ }
+ };
+
+ packageSelectionDialog.setTitle(title);
+ packageSelectionDialog.setMessage(message);
+
+ if (packageSelectionDialog.open() == Window.OK) {
+ return (IPackageFragment) packageSelectionDialog.getResult()[0];
+ }
+
+ return null;
+
+ }
+
}
Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jboss/tools/hibernate/jpt/ui/internal/persistence/details/HibernatePersistenceUnitClassesComposite.java
===================================================================
--- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jboss/tools/hibernate/jpt/ui/internal/persistence/details/HibernatePersistenceUnitClassesComposite.java 2012-08-24 12:54:41 UTC (rev 43218)
+++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jboss/tools/hibernate/jpt/ui/internal/persistence/details/HibernatePersistenceUnitClassesComposite.java 2012-08-24 12:56:23 UTC (rev 43219)
@@ -22,10 +22,9 @@
import org.eclipse.jdt.internal.core.PackageFragment;
import org.eclipse.jdt.internal.ui.JavaPlugin;
import org.eclipse.jdt.internal.ui.JavaPluginImages;
-import org.eclipse.jdt.internal.ui.dialogs.PackageSelectionDialog;
-import org.eclipse.jdt.internal.ui.util.BusyIndicatorRunnableContext;
import org.eclipse.jdt.ui.IJavaElementSearchConstants;
import org.eclipse.jdt.ui.JavaUI;
+import org.eclipse.jface.viewers.IFilter;
import org.eclipse.jface.viewers.ILabelProvider;
import org.eclipse.jface.viewers.LabelProvider;
import org.eclipse.jface.window.Window;
@@ -52,9 +51,9 @@
import org.eclipse.swt.widgets.Table;
import org.eclipse.ui.PartInitException;
import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.dialogs.FilteredList;
import org.eclipse.ui.dialogs.SelectionDialog;
import org.eclipse.ui.progress.IProgressService;
+import org.hibernate.eclipse.console.utils.DialogSelectionHelper;
import org.jboss.tools.hibernate.jpt.core.internal.context.basic.Hibernate;
import org.jboss.tools.hibernate.jpt.core.internal.context.persistence.PackageInfoRef;
@@ -279,51 +278,25 @@
}
private IPackageFragment choosePackage() {
- IJavaElement[] elements = new IJavaElement[] { getJavaProject() };
- BusyIndicatorRunnableContext context = new BusyIndicatorRunnableContext();
- IJavaSearchScope scope = SearchEngine
- .createJavaSearchScope(elements, IJavaSearchScope.SOURCES
- | IJavaSearchScope.REFERENCED_PROJECTS);
+ return DialogSelectionHelper.choosePackage(getShell(),
+ new IJavaProject[]{getJavaProject()},
+ createPackageFilter(),
+ Messages.HibernatePersistenceUnitClassesComposite_PackageSelectionDialog_title,
+ JptCommonUiMessages.ClassChooserPane_dialogMessage);
+ }
+
+ protected IFilter createPackageFilter(){
+ return new IFilter() {
+
+ public boolean select(Object element) {
+ if (element instanceof PackageFragment) {
+ PackageFragment pf = (PackageFragment) element;
+ return pf.getCompilationUnit(Hibernate.PACKAGE_INFO_JAVA).exists();
- PackageSelectionDialog packageSelectionDialog = new PackageSelectionDialog(
- getShell(), context,
- PackageSelectionDialog.F_HIDE_DEFAULT_PACKAGE
- | PackageSelectionDialog.F_HIDE_EMPTY_INNER, scope) {
-
- @Override
- protected FilteredList createFilteredList(Composite parent) {
- FilteredList list = super.createFilteredList(parent);
- //filter out packages without package-ifo.java
- list.setFilterMatcher(new FilteredList.FilterMatcher() {
-
- @Override
- public void setFilter(String pattern, boolean ignoreCase,
- boolean ignoreWildCards) {
- }
-
- @Override
- public boolean match(Object element) {
- if (element instanceof PackageFragment) {
- PackageFragment pf = (PackageFragment) element;
- return pf.getCompilationUnit(Hibernate.PACKAGE_INFO_JAVA).exists();
-
- }
- return false;
- }
- });
- return list;
+ }
+ return false;
}
};
-
- packageSelectionDialog.setTitle(Messages.HibernatePersistenceUnitClassesComposite_PackageSelectionDialog_title);
- packageSelectionDialog
- .setMessage(JptCommonUiMessages.ClassChooserPane_dialogMessage);
-
- if (packageSelectionDialog.open() == Window.OK) {
- return (IPackageFragment) packageSelectionDialog.getResult()[0];
- }
-
- return null;
}
/*
12 years, 4 months
JBoss Tools SVN: r43218 - trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml/src/org/jboss/tools/hibernate/xml/model.
by jbosstools-commits＠lists.jboss.org
Author: dgeraskov
Date: 2012-08-24 08:54:41 -0400 (Fri, 24 Aug 2012)
New Revision: 43218
Modified:
trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml/src/org/jboss/tools/hibernate/xml/model/HibernateResourceTree.java
Log:
https://issues.jboss.org/browse/JBIDE-4007
Do not allow to select Folder when browse resource, but only hbm.xml files
Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml/src/org/jboss/tools/hibernate/xml/model/HibernateResourceTree.java
===================================================================
--- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml/src/org/jboss/tools/hibernate/xml/model/HibernateResourceTree.java 2012-08-24 12:42:49 UTC (rev 43217)
+++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml/src/org/jboss/tools/hibernate/xml/model/HibernateResourceTree.java 2012-08-24 12:54:41 UTC (rev 43218)
@@ -23,7 +23,7 @@
String pathpart = o.getPathPart();
String pp = pathpart;
pp = pp.toLowerCase();
- return pp.endsWith(".hbm.xml");
+ return pp.endsWith(".hbm.xml"); //$NON-NLS-1$
}
public void setModel(XModel model) {
@@ -80,7 +80,7 @@
}
public boolean isSelectable(XModelObject object) {
- return (object != null && (object.getFileType() == XFileObject.FILE || object.getFileType() == XFileObject.FOLDER));
+ return (object != null && (object.getFileType() == XFileObject.FILE));
}
public String getPath(XModelObject o) {
@@ -90,18 +90,18 @@
if(p == null) return ""; //$NON-NLS-1$
int b = "FileSystems/".length(), e = p.length() - s.length(); //$NON-NLS-1$
if(e < b) return ""; //$NON-NLS-1$
- if(o.getFileType() == XFileObject.FOLDER) s += "/"; //$NON-NLS-1$
- if(s.startsWith("/")) s = s.substring(1);
+ if(o.getFileType() == XFileObject.FOLDER) s += XModelObjectConstants.SEPARATOR;
+ if(s.startsWith(XModelObjectConstants.SEPARATOR)) s = s.substring(1);
return s;
}
public XModelObject find(String value) {
- if(value != null && value.endsWith("/")) {
+ if(value != null && value.endsWith(XModelObjectConstants.SEPARATOR)) {
value = value.substring(0, value.length() - 1);
}
XModelObject result = model.getByPath(value);
- if(result == null && value != null && !value.startsWith("/")) { //$NON-NLS-1$
- result = model.getByPath("/" + value); //$NON-NLS-1$
+ if(result == null && value != null && !value.startsWith(XModelObjectConstants.SEPARATOR)) {
+ result = model.getByPath(XModelObjectConstants.SEPARATOR + value);
}
return result;
}
12 years, 4 months
JBoss Tools SVN: r43217 - trunk/build/aggregate.
by jbosstools-commits＠lists.jboss.org
Author: mickael_istria
Date: 2012-08-24 08:42:49 -0400 (Fri, 24 Aug 2012)
New Revision: 43217
Modified:
trunk/build/aggregate/build.xml
Log:
JBIDE-11065: support for eclipse-repository (Fix?)
Modified: trunk/build/aggregate/build.xml
===================================================================
--- trunk/build/aggregate/build.xml 2012-08-24 12:36:02 UTC (rev 43216)
+++ trunk/build/aggregate/build.xml 2012-08-24 12:42:49 UTC (rev 43217)
@@ -466,14 +466,16 @@
<target name="check.target">
<if>
- <and>
- <available file="${output.dir}/target/site" type="dir" />
- <available file="${output.dir}/target/repository" type="dir"/>
- <or>
+ <or>
+ <and> <!-- Old school eclipse-update-site -->
+ <available file="${output.dir}/target/site" type="dir" />
+ <available file="${output.dir}/target/site_assembly.zip" type="file" />
+ </and>
+ <and> <!-- eclipse-repository -->
+ <available file="${output.dir}/target/repository" type="dir"/>
<available file="${output.dir}/target/repository.zip" type="file" />
- <available file="${output.dir}/target/site_assembly.zip" type="file" />
- </or>
- </and>
+ </and>
+ </or>
<then>
<if>
<available file="${output.dir}/target/site_assembly.zip" type="file" />
12 years, 4 months
JBoss Tools SVN: r43216 - trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/model.
by jbosstools-commits＠lists.jboss.org
Author: fbricon
Date: 2012-08-24 08:36:02 -0400 (Fri, 24 Aug 2012)
New Revision: 43216
Modified:
trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/model/ProjectExampleUtil.java
Log:
JBIDE-11985 : Fetch project example descriptors in parallel
Modified: trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/model/ProjectExampleUtil.java
===================================================================
--- trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/model/ProjectExampleUtil.java 2012-08-24 11:49:18 UTC (rev 43215)
+++ trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/model/ProjectExampleUtil.java 2012-08-24 12:36:02 UTC (rev 43216)
@@ -29,6 +29,11 @@
import java.util.List;
import java.util.Set;
import java.util.StringTokenizer;
+import java.util.concurrent.Callable;
+import java.util.concurrent.CompletionService;
+import java.util.concurrent.ExecutorCompletionService;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
import javax.xml.parsers.DocumentBuilder;
import javax.xml.parsers.DocumentBuilderFactory;
@@ -308,16 +313,22 @@
public static List<ProjectExampleCategory> getProjects(
Set<IProjectExampleSite> sites, IProgressMonitor monitor) {
monitor.setTaskName(Messages.ProjectUtil_Parsing_project_description_files);
-
List<ProjectExampleCategory> list = new ArrayList<ProjectExampleCategory>();
invalidSites.clear();
ProjectExampleCategory other = ProjectExampleCategory.OTHER;
+ int threads = Runtime.getRuntime().availableProcessors();
+ //threads = 1;
+ ExecutorService service = Executors.newFixedThreadPool(threads);
+ CompletionService<Tuple<IProjectExampleSite, Document>> pool = new ExecutorCompletionService<Tuple<IProjectExampleSite, Document>>(service);
try {
boolean showExperimentalSites = ProjectExamplesActivator
.getDefault()
.getPreferenceStore()
.getBoolean(
ProjectExamplesActivator.SHOW_EXPERIMENTAL_SITES);
+
+
+ int count = 0;
for (IProjectExampleSite site : sites) {
if (!showExperimentalSites && site.isExperimental()) {
continue;
@@ -326,31 +337,20 @@
invalidSites.add(site);
continue;
}
- File file = getProjectExamplesFile(site.getUrl(),
- "projectExamples", ".xml", monitor); //$NON-NLS-1$ //$NON-NLS-2$
- if (monitor.isCanceled()) {
+
+ pool.submit(new FetchProjectExampleDocumentTask(site));
+ count++;
+ }
+
+ for (int k=0; k <count; k++) {
+ //Handle the next finished task first
+ Tuple<IProjectExampleSite, Document> tuple = pool.take().get();
+ IProjectExampleSite site = tuple.key;
+ Document doc = tuple.value;
+ if (doc == null) {
invalidSites.add(site);
continue;
}
- if (file == null || !file.exists() || !file.isFile()) {
- ProjectExamplesActivator.log(NLS.bind(
- Messages.ProjectUtil_Invalid_URL, site.getUrl()
- .toString()));
- invalidSites.add(site);
- continue;
- }
-
- Document doc;
- try {
- DocumentBuilderFactory dbf = DocumentBuilderFactory
- .newInstance();
- DocumentBuilder db = dbf.newDocumentBuilder();
- doc = db.parse(file);
- } catch (Exception e) {
- ProjectExamplesActivator.log(e);
- invalidSites.add(site);
- continue;
- }
NodeList projects = doc.getElementsByTagName("project"); //$NON-NLS-1$
int len = projects.getLength();
for (int i = 0; i < len; i++) {
@@ -486,6 +486,8 @@
}
} catch (Exception e) {
ProjectExamplesActivator.log(e);
+ } finally {
+ service.shutdown();
}
list.add(other);
handleCategories(list, monitor);
@@ -900,4 +902,45 @@
return selection;
}
+ private static class Tuple<X, Y> {
+
+ X key;
+ Y value;
+
+ public Tuple(X key) {
+ this.key = key;
+ }
+
+ }
+
+ private static class FetchProjectExampleDocumentTask implements Callable<Tuple<IProjectExampleSite, Document>> {
+
+ Tuple<IProjectExampleSite, Document> tuple;
+
+ public FetchProjectExampleDocumentTask(IProjectExampleSite site) {
+ tuple = new Tuple<IProjectExampleSite, Document>(site);
+ }
+
+ @Override
+ public Tuple<IProjectExampleSite, Document> call() throws Exception {
+ URL url = tuple.key.getUrl();
+ File file = getProjectExamplesFile(url, "projectExamples", ".xml", new NullProgressMonitor());
+ if(file == null || !file.exists() || !file.isFile()) {
+ ProjectExamplesActivator.log(NLS.bind(Messages.ProjectUtil_Invalid_URL, url.toString()));
+ return tuple;
+ }
+
+ try {
+ DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
+ DocumentBuilder db = dbf.newDocumentBuilder();
+ Document doc = db.parse(file);
+ tuple.value = doc;
+
+ } catch (Exception e) {
+ ProjectExamplesActivator.log(e);
+ }
+ return tuple;
+ }
+
+ }
}
12 years, 4 months
JBoss Tools SVN: r43215 - branches/jbosstools-3.3.x/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/task/server.
by jbosstools-commits＠lists.jboss.org
Author: ljelinko
Date: 2012-08-24 07:49:18 -0400 (Fri, 24 Aug 2012)
New Revision: 43215
Modified:
branches/jbosstools-3.3.x/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/task/server/MarkFileAsDeployableTask.java
Log:
Added special treatment for Windows.
Modified: branches/jbosstools-3.3.x/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/task/server/MarkFileAsDeployableTask.java
===================================================================
--- branches/jbosstools-3.3.x/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/task/server/MarkFileAsDeployableTask.java 2012-08-24 11:44:40 UTC (rev 43214)
+++ branches/jbosstools-3.3.x/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/task/server/MarkFileAsDeployableTask.java 2012-08-24 11:49:18 UTC (rev 43215)
@@ -1,12 +1,16 @@
package org.jboss.tools.portlet.ui.bot.task.server;
+import static org.eclipse.swtbot.swt.finder.waits.Conditions.shellIsActive;
+
import java.awt.AWTException;
import java.awt.Robot;
import java.awt.event.KeyEvent;
+import org.eclipse.swtbot.swt.finder.widgets.SWTBotShell;
import org.jboss.tools.portlet.ui.bot.entity.WorkspaceFile;
import org.jboss.tools.portlet.ui.bot.task.AbstractSWTTask;
import org.jboss.tools.portlet.ui.bot.task.workspace.FileContextMenuSelectingTask;
+import org.jboss.tools.ui.bot.ext.SWTBotFactory;
/**
* Marks a file as deployable for the specified server (it works only if there is just one server defined)
@@ -24,7 +28,25 @@
@Override
public void perform() {
+ System.out.println("*** Shells: ***");
+ SWTBotShell activeShell = SWTBotFactory.getBot().activeShell();
+ System.out.println("A: " + activeShell.getText());
+ for (SWTBotShell shell : SWTBotFactory.getBot().shells()){
+ System.out.println(shell.getText());
+ }
+
+
performInnerTask(new FileContextMenuSelectingTask(workspaceFile, "Mark as Deployable"));
+
+ SWTBotFactory.getBot().waitUntil(shellIsActive("Really mark these resources as deployable?"));
+
+ System.out.println("---------");
+ activeShell = SWTBotFactory.getBot().activeShell();
+ System.out.println("A: " + activeShell.getText());
+ for (SWTBotShell shell : SWTBotFactory.getBot().shells()){
+ System.out.println(shell.getText());
+ }
+
// for the confirmation dialog select OK (the dialog is native and normal swtbot functions do now work)
try {
Robot robot = new Robot();
12 years, 4 months
JBoss Tools SVN: r43214 - trunk/build/aggregate.
by jbosstools-commits＠lists.jboss.org
Author: mickael_istria
Date: 2012-08-24 07:44:40 -0400 (Fri, 24 Aug 2012)
New Revision: 43214
Modified:
trunk/build/aggregate/build.xml
Log:
JBIDE-11065: support for eclipse-repository
Modified: trunk/build/aggregate/build.xml
===================================================================
--- trunk/build/aggregate/build.xml 2012-08-24 09:39:01 UTC (rev 43213)
+++ trunk/build/aggregate/build.xml 2012-08-24 11:44:40 UTC (rev 43214)
@@ -468,6 +468,7 @@
<if>
<and>
<available file="${output.dir}/target/site" type="dir" />
+ <available file="${output.dir}/target/repository" type="dir"/>
<or>
<available file="${output.dir}/target/repository.zip" type="file" />
<available file="${output.dir}/target/site_assembly.zip" type="file" />
12 years, 4 months
JBoss Tools SVN: r43213 - in trunk/central/plugins/org.jboss.tools.central: css and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: mickael_istria
Date: 2012-08-24 05:39:01 -0400 (Fri, 24 Aug 2012)
New Revision: 43213
Added:
trunk/central/plugins/org.jboss.tools.central/css/
trunk/central/plugins/org.jboss.tools.central/css/jbt.css
Modified:
trunk/central/plugins/org.jboss.tools.central/plugin.xml
Log:
JBDS-2250: Added theme to Central
Added: trunk/central/plugins/org.jboss.tools.central/css/jbt.css
===================================================================
--- trunk/central/plugins/org.jboss.tools.central/css/jbt.css (rev 0)
+++ trunk/central/plugins/org.jboss.tools.central/css/jbt.css 2012-08-24 09:39:01 UTC (rev 43213)
@@ -0,0 +1,113 @@
+/*
+ * Chrome Theme generate css dynamically, So do not inspect this file, See "ChromeCSSGenerator.xtend" instead
+ */
+.jeeeyul-chrome-theme{
+ /*
+ * This selector rule is exist for detect Chrome Theme to find rewrite target.
+ * See "RewriteChormeCSS.java"
+ */
+}
+
+.MTrimmedWindow.topLevel {
+ margin-top: 7px;
+ margin-bottom: 2px;
+ margin-left: 2px;
+ margin-right: 2px;
+}
+
+.MPartStack {
+ font-size: 11;
+ font-family: 'Arial';
+ swt-simple: true;
+ swt-tab-renderer:
+ url('bundleclass://net.jeeeyul.eclipse.themes/net.jeeeyul.eclipse.themes.rendering.ChromeTabRendering');
+
+ padding: 1px 6px 8px 6px; /* top left bottom right */
+ swt-tab-outline: #b39797;
+ swt-outer-keyline-color: #b39797;
+ swt-unselected-tabs-color: #ecd2d2 #e0c3c3 #ffffff 99% 100%;
+ swt-shadow-visible: true;
+
+ swt-selected-tab-fill: #ffffff;
+ chrome-selected-tab-fill-highlight: #ffffff;
+
+ chrome-selected-tab-color: #000000;
+ chrome-unselected-tab-color: #000000;
+
+ swt-shadow-color: #e0c2c2;
+
+ chrome-shiney-shadow: true;
+ swt-mru-visible: true;
+}
+
+.MPartStack.active {
+ swt-inner-keyline-color: #FFFFFF;
+ swt-tab-outline: #7b5d5d;
+ swt-outer-keyline-color: #7b5d5d;
+ swt-unselected-tabs-color: #b36b6b #aa5b5b #ffffff 99% 100%;
+
+ swt-selected-tab-fill: #ffffff;
+ chrome-selected-tab-fill-highlight: #ffffff;
+
+ chrome-selected-tab-color: #983030;
+ chrome-unselected-tab-color: #ffffff;
+ chrome-shiney-shadow: false;
+}
+
+.MPartStack.empty {
+ swt-unselected-tabs-color: #907575 #907575 #907575 99% 100%;
+ swt-tab-outline: #907575;
+ swt-outer-keyline-color: #907575;
+}
+
+.MToolControl.TrimStack {
+ frame-image: url("./winXPTSFrame.png");
+ handle-image: url("./winXPHandle.png");
+ frame-cuts: 5px 1px 5px 16px;
+}
+
+.MTrimmedWindow {
+ margin-top: 2px;
+ margin-bottom: 2px;
+ margin-left: 0px;
+ margin-right: 0px;
+ background-color: #faefef;
+}
+
+.MTrimBar {
+ background-color: #faefef;
+}
+
+.MTrimBar#org-eclipse-ui-main-toolbar {
+ background-color: #e7cccc #d1b2b2;
+}
+
+.MToolControl.TrimStack {
+ frame-image: url("./jeeeyul-TSFrame.png");
+ handle-image: url("./jeeeyul-Handle.png");
+}
+
+#PerspectiveSwitcher {
+ eclipse-perspective-keyline-color: #ac8f8f;
+ background-color: #faf5f5 #faefef 100%;
+}
+
+CTabFolder.MArea .MPartStack,CTabFolder.MArea .MPartStack.active {
+ swt-shadow-visible: false;
+}
+
+CTabFolder Canvas {
+ background-color: #F8F8F8;
+}
+
+#org-eclipse-ui-editorss {
+ swt-tab-renderer:
+ url('bundleclass://org.eclipse.e4.ui.workbench.renderers.swt/org.eclipse.e4.ui.workbench.renderers.swt.CTabRendering');
+ swt-unselected-tabs-color: #F0F0F0 #F0F0F0 #F0F0F0 100% 100%;
+ swt-outer-keyline-color: #B4B4B4;
+ swt-inner-keyline-color: #F0F0F0;
+ swt-tab-outline: #F0F0F0;
+ color: #F0F0F0;
+ swt-tab-height: 8px;
+ padding: 0px 5px 7px;
+}
Property changes on: trunk/central/plugins/org.jboss.tools.central/css/jbt.css
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Modified: trunk/central/plugins/org.jboss.tools.central/plugin.xml
===================================================================
--- trunk/central/plugins/org.jboss.tools.central/plugin.xml 2012-08-24 08:35:04 UTC (rev 43212)
+++ trunk/central/plugins/org.jboss.tools.central/plugin.xml 2012-08-24 09:39:01 UTC (rev 43213)
@@ -264,5 +264,13 @@
<newWizardShortcut id="org.jboss.tools.central.wizards.NewGwtProjectWizard"/>
</perspectiveExtension>
</extension>
+ <extension
+ point="org.eclipse.e4.ui.css.swt.theme">
+ <theme
+ basestylesheeturi="css/jbt.css"
+ id="org.jboss.tools.central.theme"
+ label="JBoss Tools & Developer Studio">
+ </theme>
+ </extension>
</plugin>
12 years, 4 months
JBoss Tools SVN: r43212 - trunk/tests/tests/org.jboss.tools.dummy.ui.bot.test/src/org/jboss/tools/dummy/ui/bot/test.
by jbosstools-commits＠lists.jboss.org
Author: jpeterka
Date: 2012-08-24 04:35:04 -0400 (Fri, 24 Aug 2012)
New Revision: 43212
Modified:
trunk/tests/tests/org.jboss.tools.dummy.ui.bot.test/src/org/jboss/tools/dummy/ui/bot/test/DummyTest.java
Log:
MacOSX Preference workaround applied, STD menu doesn't work
Modified: trunk/tests/tests/org.jboss.tools.dummy.ui.bot.test/src/org/jboss/tools/dummy/ui/bot/test/DummyTest.java
===================================================================
--- trunk/tests/tests/org.jboss.tools.dummy.ui.bot.test/src/org/jboss/tools/dummy/ui/bot/test/DummyTest.java 2012-08-24 08:26:19 UTC (rev 43211)
+++ trunk/tests/tests/org.jboss.tools.dummy.ui.bot.test/src/org/jboss/tools/dummy/ui/bot/test/DummyTest.java 2012-08-24 08:35:04 UTC (rev 43212)
@@ -5,6 +5,7 @@
import static org.junit.Assert.assertEquals;
import org.apache.log4j.Logger;
+import org.eclipse.swt.SWT;
import org.eclipse.swtbot.eclipse.finder.SWTWorkbenchBot;
import org.eclipse.swtbot.swt.finder.junit.SWTBotJunit4ClassRunner;
import org.eclipse.swtbot.swt.finder.widgets.SWTBotShell;
@@ -29,18 +30,19 @@
@Test
public void dummyTest() {
- String prefMenu = "Preferences";
- String prefDlg = prefMenu;
- String windowMenu = "Window";
+ String pref = "Preferences";
+ String window = "Window";
+
+ SWTWorkbenchBot bot = new SWTWorkbenchBot();
if (isOSX()) {
- prefMenu = "Preferences";
- windowMenu = "Eclipse";
+ bot.shells()[0].pressShortcut(SWT.COMMAND, ',');
}
- SWTWorkbenchBot bot = new SWTWorkbenchBot();
- bot.menu(windowMenu).menu(prefMenu).click();
- bot.waitUntil(shellIsActive(prefDlg), 10000);
- SWTBotShell shell = bot.shell(prefDlg);
- assertEquals(prefDlg,shell.getText());
+ else {
+ bot.menu(window).menu(pref).click();
+ }
+ bot.waitUntil(shellIsActive(pref), 10000);
+ SWTBotShell shell = bot.shell(pref);
+ assertEquals(pref,shell.getText());
bot.activeShell().close();
}
12 years, 4 months
JBoss Tools SVN: r43211 - trunk/tests/tests/org.jboss.tools.dummy.ui.bot.test/src/org/jboss/tools/dummy/ui/bot/test.
by jbosstools-commits＠lists.jboss.org
Author: jpeterka
Date: 2012-08-24 04:26:19 -0400 (Fri, 24 Aug 2012)
New Revision: 43211
Modified:
trunk/tests/tests/org.jboss.tools.dummy.ui.bot.test/src/org/jboss/tools/dummy/ui/bot/test/DummyTest.java
Log:
Dummy fix menu name on Mac
Modified: trunk/tests/tests/org.jboss.tools.dummy.ui.bot.test/src/org/jboss/tools/dummy/ui/bot/test/DummyTest.java
===================================================================
--- trunk/tests/tests/org.jboss.tools.dummy.ui.bot.test/src/org/jboss/tools/dummy/ui/bot/test/DummyTest.java 2012-08-24 08:23:28 UTC (rev 43210)
+++ trunk/tests/tests/org.jboss.tools.dummy.ui.bot.test/src/org/jboss/tools/dummy/ui/bot/test/DummyTest.java 2012-08-24 08:26:19 UTC (rev 43211)
@@ -33,7 +33,7 @@
String prefDlg = prefMenu;
String windowMenu = "Window";
if (isOSX()) {
- prefMenu = "Preferences...";
+ prefMenu = "Preferences";
windowMenu = "Eclipse";
}
SWTWorkbenchBot bot = new SWTWorkbenchBot();
12 years, 4 months
JBoss Tools SVN: r43210 - trunk/tests/tests/org.jboss.tools.dummy.ui.bot.test.
by jbosstools-commits＠lists.jboss.org
Author: jpeterka
Date: 2012-08-24 04:23:28 -0400 (Fri, 24 Aug 2012)
New Revision: 43210
Modified:
trunk/tests/tests/org.jboss.tools.dummy.ui.bot.test/pom.xml
Log:
parameter format fixed in pom.xml debug profile
Modified: trunk/tests/tests/org.jboss.tools.dummy.ui.bot.test/pom.xml
===================================================================
--- trunk/tests/tests/org.jboss.tools.dummy.ui.bot.test/pom.xml 2012-08-24 08:20:51 UTC (rev 43209)
+++ trunk/tests/tests/org.jboss.tools.dummy.ui.bot.test/pom.xml 2012-08-24 08:23:28 UTC (rev 43210)
@@ -31,8 +31,8 @@
<profile>
<id>mvn-debug</id>
<properties>
- <systemProperties>-Xdebug
- -Xrunjdwp:transport=dt_socket,address=8001,server=y,suspend=y</systemProperties>
+ <!-- must be one line -->
+ <systemProperties>-Xdebug -Xrunjdwp:transport=dt_socket,address=8001,server=y,suspend=y</systemProperties>
</properties>
</profile>
</profiles>
12 years, 4 months