JBoss Tools SVN: r40191 - trunk/maven/plugins/org.jboss.tools.maven.gwt/META-INF.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2012-04-14 12:21:34 -0400 (Sat, 14 Apr 2012)
New Revision: 40191
Modified:
trunk/maven/plugins/org.jboss.tools.maven.gwt/META-INF/MANIFEST.MF
Log:
JBIDE-11469 relax restrictions on org.eclipse.m2e 1.0 plugins so that in theory this can be installed on Juno too (m2e 1.1)
Modified: trunk/maven/plugins/org.jboss.tools.maven.gwt/META-INF/MANIFEST.MF
===================================================================
--- trunk/maven/plugins/org.jboss.tools.maven.gwt/META-INF/MANIFEST.MF 2012-04-14 00:47:01 UTC (rev 40190)
+++ trunk/maven/plugins/org.jboss.tools.maven.gwt/META-INF/MANIFEST.MF 2012-04-14 16:21:34 UTC (rev 40191)
@@ -5,12 +5,12 @@
Bundle-Version: 1.3.0.qualifier
Bundle-Activator: org.jboss.tools.maven.gwt.MavenGWTPlugin
Require-Bundle: org.eclipse.core.runtime;bundle-version="3.7.0",
- org.eclipse.m2e.core;bundle-version="1.0.200",
+ org.eclipse.m2e.core;bundle-version="[1.0.200,1.2.0)",
org.eclipse.core.resources;bundle-version="3.7.100",
com.google.gwt.eclipse.core;bundle-version="2.5.0",
org.eclipse.jdt.core;bundle-version="3.7.0",
org.slf4j.api;bundle-version="1.6.0",
- org.eclipse.m2e.maven.runtime;bundle-version="[1.0.0,1.1.0)",
+ org.eclipse.m2e.maven.runtime;bundle-version="[1.0.0,1.2.0)",
org.eclipse.jface;bundle-version="3.7.0",
org.jboss.tools.maven.ui;bundle-version="1.3.0",
org.eclipse.ui;bundle-version="3.7.0"
13 years, 12 months
- 1
- 0
JBoss Tools SVN: r40190 - trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/loaders/impl.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2012-04-13 20:47:01 -0400 (Fri, 13 Apr 2012)
New Revision: 40190
Modified:
trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/loaders/impl/PropertiesLoader.java
Log:
JBIDE-11526
https://issues.jboss.org/browse/JBIDE-11526
JBoss Properties Editor should insert default line delimiter for new entries.
Modified: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/loaders/impl/PropertiesLoader.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/loaders/impl/PropertiesLoader.java 2012-04-14 00:37:37 UTC (rev 40189)
+++ trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/loaders/impl/PropertiesLoader.java 2012-04-14 00:47:01 UTC (rev 40190)
@@ -16,6 +16,7 @@
import org.eclipse.core.resources.IFile;
import org.eclipse.core.resources.IResource;
+import org.eclipse.core.resources.ProjectScope;
import org.jboss.tools.common.model.*;
import org.jboss.tools.common.model.loaders.*;
import org.jboss.tools.common.model.util.XModelObjectLoaderUtil;
@@ -27,7 +28,14 @@
public class PropertiesLoader implements XObjectLoader {
public static String ENT_PROPERTY = "Property"; //$NON-NLS-1$
static String INTERNAL_SEPARATOR = "@"; //$NON-NLS-1$
- String defaultLineSeparator = "\r\n"; //$NON-NLS-1$
+ static String defaultLineSeparator;
+
+ static {
+ defaultLineSeparator = System.getProperty("line.separator"); //$NON-NLS-1$
+ if(defaultLineSeparator == null) {
+ defaultLineSeparator = "\r\n"; //$NON-NLS-1$
+ }
+ }
public PropertiesLoader() {}
@@ -36,11 +44,14 @@
String encoding = object.get("_encoding_"); //$NON-NLS-1$
return encoding != null && encoding.length() > 0 ? encoding : "8859_1"; //$NON-NLS-1$
}
- IResource resource = (IResource)object.getAdapter(IResource.class);
- if(!(resource instanceof IFile)) return null;
- IFile f = (IFile)resource;
- return FileUtil.getEncoding(f);
+ IFile f = getFile(object);
+ return f != null ? FileUtil.getEncoding(f) : null;
}
+
+ private static IFile getFile(XModelObject object) {
+ Object resource = object.getAdapter(IResource.class);
+ return (resource instanceof IFile) ? (IFile)resource : null;
+ }
public void load(XModelObject object) {
String encoding = getEncoding(object);
@@ -71,6 +82,17 @@
while(st.hasMoreTokens()) {
String s = st.nextToken();
if(s.equals("\r")) { //$NON-NLS-1$
+ if(lineEnd.toString().equals("\r")) { //$NON-NLS-1$
+ if(state == 0) {
+ state = 1;
+ } else if(state == 2) {
+ state = 0;
+ c.setAttributeValue("dirtyvalue", sb.toString()); //$NON-NLS-1$
+ c.setAttributeValue("line-end", lineEnd.toString()); //$NON-NLS-1$
+ sb.setLength(0);
+ lineEnd.setLength(0);
+ }
+ }
if(state != 2) sb.append(s); else lineEnd.append(s);
continue;
}
@@ -168,7 +190,7 @@
public boolean save(XModelObject object) {
if(!object.isModified()) return true;
- XModelObjectLoaderUtil.setTempBody(object, generateBody(object, defaultLineSeparator));
+ XModelObjectLoaderUtil.setTempBody(object, generateBody(object));
object.setModified(true);
return true;
}
@@ -179,13 +201,21 @@
}
public String getBody(XModelObject object) {
- return generateBody(object, defaultLineSeparator);
+ return generateBody(object);
}
-
- String generateBody(XModelObject object, String lineSeparator) {
+
+ private String generateBody(XModelObject object) {
+ String lineSeparator = defaultLineSeparator;
StringBuffer sb = new StringBuffer();
XModelObject[] cs = object.getChildren();
for (int i = 0; i < cs.length; i++) {
+ String ls = cs[i].get("line-end"); //$NON-NLS-1$
+ if(ls.length() > 0 && !ls.equals("\\r\\n")) { //$NON-NLS-1$
+ lineSeparator = ls;
+ break;
+ }
+ }
+ for (int i = 0; i < cs.length; i++) {
String name_value_separator = cs[i].getAttributeValue("name-value-separator"); //$NON-NLS-1$
if(name_value_separator == null || name_value_separator.length() != 1 || " \t=:".indexOf(name_value_separator) < 0) { //$NON-NLS-1$
name_value_separator = "="; //$NON-NLS-1$
@@ -220,10 +250,10 @@
sb.append(resolved);
String ls = cs[i].get("line-end"); //$NON-NLS-1$
if(ls.length() > 0) {
- if(ls.equals("\\r\\n")) ls = defaultLineSeparator; //$NON-NLS-1$
+ if(ls.equals("\\r\\n")) ls = lineSeparator; //$NON-NLS-1$
sb.append(ls);
} else if(i < cs.length - 1) {
- ls = defaultLineSeparator;
+ ls = lineSeparator;
sb.append(ls);
}
}
13 years, 12 months
- 1
- 0
JBoss Tools SVN: r40189 - in trunk/cdi/tests/org.jboss.tools.cdi.core.test: src/org/jboss/tools/cdi/core/test/tck and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2012-04-13 20:37:37 -0400 (Fri, 13 Apr 2012)
New Revision: 40189
Added:
trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/implementation/simple/lifecycle/TameLion.java
Modified:
trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/BeanSpecializationTest.java
Log:
JBIDE-11449
https://issues.jboss.org/browse/JBIDE-11449
Specialized Bean can set bean name if it is not inherited. - Test added.
Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/implementation/simple/lifecycle/TameLion.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/implementation/simple/lifecycle/TameLion.java (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/implementation/simple/lifecycle/TameLion.java 2012-04-14 00:37:37 UTC (rev 40189)
@@ -0,0 +1,27 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., and individual contributors
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.jboss.jsr299.tck.tests.implementation.simple.lifecycle;
+
+import javax.enterprise.inject.Specializes;
+import javax.inject.Named;
+
+@Specializes
+@Named
+class TameLion extends Lion
+{
+
+}
Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/implementation/simple/lifecycle/TameLion.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Modified: trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/BeanSpecializationTest.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/BeanSpecializationTest.java 2012-04-13 22:57:10 UTC (rev 40188)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/BeanSpecializationTest.java 2012-04-14 00:37:37 UTC (rev 40189)
@@ -81,4 +81,11 @@
IBean bean = beans.iterator().next();
assertEquals("Incorrect bean name", "farmer", bean.getName());
}
+
+ public void testSimpleSpecializingBeanDefinesNameWhenSpecializedBeanIsNotNamed() throws JavaModelException {
+ Set<IBean> beans = cdiProject.getBeans(true, "org.jboss.jsr299.tck.tests.implementation.simple.lifecycle.TameLion", "org.jboss.jsr299.tck.tests.implementation.simple.lifecycle.Tame");
+ assertEquals("Wrong number of beans.", 1, beans.size());
+ IBean bean = beans.iterator().next();
+ assertEquals("Incorrect bean name", "tameLion", bean.getName());
+ }
}
\ No newline at end of file
13 years, 12 months
- 1
- 0
JBoss Tools SVN: r40188 - in trunk: seam/plugins/org.jboss.tools.seam.ui and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: akazakov
Date: 2012-04-13 18:57:10 -0400 (Fri, 13 Apr 2012)
New Revision: 40188
Modified:
trunk/cdi/plugins/org.jboss.tools.cdi.ui/plugin.xml
trunk/seam/plugins/org.jboss.tools.seam.ui/plugin.xml
Log:
https://issues.jboss.org/browse/JBIDE-11471 Context New Menu does not provide the best options for "java"
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.ui/plugin.xml
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.ui/plugin.xml 2012-04-13 21:01:21 UTC (rev 40187)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.ui/plugin.xml 2012-04-13 22:57:10 UTC (rev 40188)
@@ -446,89 +446,39 @@
type="new"
wizardId="org.jboss.tools.cdi.ui.wizard.NewBeanCreationWizard">
<enablement>
- <or>
- <instanceof value="org.eclipse.jdt.core.IPackageFragment"/>
- <instanceof value="org.eclipse.jdt.core.IPackageFragmentRoot"/>
- <instanceof value="org.eclipse.jdt.core.ICompilationUnit"/>
- <adapt type="org.eclipse.core.resources.IProject">
- <test property="org.eclipse.core.resources.projectNature" value="org.jboss.tools.cdi.core.cdinature"/>
- </adapt>
- </or>
+ <and>
+ <or>
+ <instanceof value="org.eclipse.jdt.core.IPackageFragment"/>
+ <instanceof value="org.eclipse.jdt.core.IPackageFragmentRoot"/>
+ <instanceof value="org.eclipse.jdt.core.ICompilationUnit"/>
+ <adapt type="org.eclipse.core.resources.IProject">
+ <test property="org.eclipse.core.resources.projectNature" value="org.jboss.tools.cdi.core.cdinature"/>
+ </adapt>
+ </or>
+ <adapt type="org.eclipse.core.resources.IResource">
+ <test property="org.eclipse.core.resources.projectNature" value="org.jboss.tools.cdi.core.cdinature"/>
+ </adapt>
+ </and>
</enablement>
</commonWizard>
<commonWizard
menuGroupId="org.jboss.tools.cdi.ui"
type="new"
- wizardId="org.jboss.tools.cdi.ui.wizard.NewQualifierCreationWizard">
- <enablement>
- <or>
- <instanceof value="org.eclipse.jdt.core.IPackageFragment"/>
- <instanceof value="org.eclipse.jdt.core.IPackageFragmentRoot"/>
- <instanceof value="org.eclipse.jdt.core.ICompilationUnit"/>
- <adapt type="org.eclipse.core.resources.IProject">
- <test property="org.eclipse.core.resources.projectNature" value="org.jboss.tools.cdi.core.cdinature"/>
- </adapt>
- </or>
- </enablement>
- </commonWizard>
- <commonWizard
- menuGroupId="org.jboss.tools.cdi.ui"
- type="new"
- wizardId="org.jboss.tools.cdi.ui.wizard.NewStereotypeCreationWizard">
- <enablement>
- <or>
- <instanceof value="org.eclipse.jdt.core.IPackageFragment"/>
- <instanceof value="org.eclipse.jdt.core.IPackageFragmentRoot"/>
- <instanceof value="org.eclipse.jdt.core.ICompilationUnit"/>
- <adapt type="org.eclipse.core.resources.IProject">
- <test property="org.eclipse.core.resources.projectNature" value="org.jboss.tools.cdi.core.cdinature"/>
- </adapt>
- </or>
- </enablement>
- </commonWizard>
- <commonWizard
- menuGroupId="org.jboss.tools.cdi.ui"
- type="new"
- wizardId="org.jboss.tools.cdi.ui.wizard.NewScopeCreationWizard">
- <enablement>
- <or>
- <instanceof value="org.eclipse.jdt.core.IPackageFragment"/>
- <instanceof value="org.eclipse.jdt.core.IPackageFragmentRoot"/>
- <instanceof value="org.eclipse.jdt.core.ICompilationUnit"/>
- <adapt type="org.eclipse.core.resources.IProject">
- <test property="org.eclipse.core.resources.projectNature" value="org.jboss.tools.cdi.core.cdinature"/>
- </adapt>
- </or>
- </enablement>
- </commonWizard>
- <commonWizard
- menuGroupId="org.jboss.tools.cdi.ui"
- type="new"
- wizardId="org.jboss.tools.cdi.ui.wizard.NewInterceptorBindingCreationWizard">
- <enablement>
- <or>
- <instanceof value="org.eclipse.jdt.core.IPackageFragment"/>
- <instanceof value="org.eclipse.jdt.core.IPackageFragmentRoot"/>
- <instanceof value="org.eclipse.jdt.core.ICompilationUnit"/>
- <adapt type="org.eclipse.core.resources.IProject">
- <test property="org.eclipse.core.resources.projectNature" value="org.jboss.tools.cdi.core.cdinature"/>
- </adapt>
- </or>
- </enablement>
- </commonWizard>
- <commonWizard
- menuGroupId="org.jboss.tools.cdi.ui"
- type="new"
wizardId="org.jboss.tools.cdi.ui.wizard.NewInterceptorCreationWizard">
<enablement>
- <or>
- <instanceof value="org.eclipse.jdt.core.IPackageFragment"/>
- <instanceof value="org.eclipse.jdt.core.IPackageFragmentRoot"/>
- <instanceof value="org.eclipse.jdt.core.ICompilationUnit"/>
- <adapt type="org.eclipse.core.resources.IProject">
- <test property="org.eclipse.core.resources.projectNature" value="org.jboss.tools.cdi.core.cdinature"/>
- </adapt>
- </or>
+ <and>
+ <or>
+ <instanceof value="org.eclipse.jdt.core.IPackageFragment"/>
+ <instanceof value="org.eclipse.jdt.core.IPackageFragmentRoot"/>
+ <instanceof value="org.eclipse.jdt.core.ICompilationUnit"/>
+ <adapt type="org.eclipse.core.resources.IProject">
+ <test property="org.eclipse.core.resources.projectNature" value="org.jboss.tools.cdi.core.cdinature"/>
+ </adapt>
+ </or>
+ <adapt type="org.eclipse.core.resources.IResource">
+ <test property="org.eclipse.core.resources.projectNature" value="org.jboss.tools.cdi.core.cdinature"/>
+ </adapt>
+ </and>
</enablement>
</commonWizard>
<commonWizard
@@ -536,41 +486,36 @@
type="new"
wizardId="org.jboss.tools.cdi.ui.wizard.NewDecoratorCreationWizard">
<enablement>
- <or>
- <instanceof value="org.eclipse.jdt.core.IPackageFragment"/>
- <instanceof value="org.eclipse.jdt.core.IPackageFragmentRoot"/>
- <instanceof value="org.eclipse.jdt.core.ICompilationUnit"/>
- <adapt type="org.eclipse.core.resources.IProject">
- <test property="org.eclipse.core.resources.projectNature" value="org.jboss.tools.cdi.core.cdinature"/>
- </adapt>
- </or>
+ <and>
+ <or>
+ <instanceof value="org.eclipse.jdt.core.IPackageFragment"/>
+ <instanceof value="org.eclipse.jdt.core.IPackageFragmentRoot"/>
+ <instanceof value="org.eclipse.jdt.core.ICompilationUnit"/>
+ <adapt type="org.eclipse.core.resources.IProject">
+ <test property="org.eclipse.core.resources.projectNature" value="org.jboss.tools.cdi.core.cdinature"/>
+ </adapt>
+ </or>
+ <adapt type="org.eclipse.core.resources.IResource">
+ <test property="org.eclipse.core.resources.projectNature" value="org.jboss.tools.cdi.core.cdinature"/>
+ </adapt>
+ </and>
</enablement>
</commonWizard>
<commonWizard
menuGroupId="org.jboss.tools.cdi.ui"
type="new"
- wizardId="org.jboss.tools.cdi.ui.wizard.NewAnnotationLiteralCreationWizard">
- <enablement>
- <or>
- <instanceof value="org.eclipse.jdt.core.IPackageFragment"/>
- <instanceof value="org.eclipse.jdt.core.IPackageFragmentRoot"/>
- <instanceof value="org.eclipse.jdt.core.ICompilationUnit"/>
- <adapt type="org.eclipse.core.resources.IProject">
- <test property="org.eclipse.core.resources.projectNature" value="org.jboss.tools.cdi.core.cdinature"/>
- </adapt>
- </or>
- </enablement>
- </commonWizard>
- <commonWizard
- menuGroupId="org.jboss.tools.cdi.ui"
- type="new"
wizardId="org.jboss.tools.cdi.ui.wizard.NewBeansXMLCreationWizard">
<enablement>
- <or>
- <adapt type="org.eclipse.core.resources.IFolder" />
- <adapt type="org.eclipse.core.resources.IProject" />
- <adapt type="org.eclipse.core.resources.IWorkspaceRoot" />
- </or>
+ <and>
+ <or>
+ <adapt type="org.eclipse.core.resources.IFolder" />
+ <adapt type="org.eclipse.core.resources.IProject" />
+ <adapt type="org.eclipse.core.resources.IWorkspaceRoot" />
+ </or>
+ <adapt type="org.eclipse.core.resources.IResource">
+ <test property="org.eclipse.core.resources.projectNature" value="org.jboss.tools.cdi.core.cdinature"/>
+ </adapt>
+ </and>
</enablement>
</commonWizard>
</extension>
Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/plugin.xml
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.ui/plugin.xml 2012-04-13 21:01:21 UTC (rev 40187)
+++ trunk/seam/plugins/org.jboss.tools.seam.ui/plugin.xml 2012-04-13 22:57:10 UTC (rev 40188)
@@ -269,96 +269,6 @@
</enablement>
</actionProvider>
- <commonWizard
- menuGroupId="org.jboss.tools.seam.ui"
- type="new"
- wizardId="org.jboss.tools.seam.ui.wizards.SeamProjectWizard">
- <enablement>
- <or>
- <adapt type="org.eclipse.core.resources.IFile" />
- <adapt type="org.eclipse.core.resources.IFolder" />
- <adapt type="org.eclipse.core.resources.IProject" />
- <adapt type="org.eclipse.core.resources.IWorkspaceRoot" />
- <instanceof value="org.jboss.tools.seam.core.ISeamElement"/>
- </or>
- </enablement>
- </commonWizard>
-
- <commonWizard
- menuGroupId="org.jboss.tools.seam.ui"
- type="new"
- wizardId="org.jboss.tools.seam.ui.wizard.SeamActionWizard">
- <enablement>
- <or>
- <adapt type="org.eclipse.core.resources.IFile" />
- <adapt type="org.eclipse.core.resources.IFolder" />
- <adapt type="org.eclipse.core.resources.IProject" />
- <adapt type="org.eclipse.core.resources.IWorkspaceRoot" />
- <instanceof value="org.jboss.tools.seam.core.ISeamElement"/>
- </or>
- </enablement>
- </commonWizard>
-
- <commonWizard
- menuGroupId="org.jboss.tools.seam.ui"
- type="new"
- wizardId="org.jboss.tools.seam.ui.wizard.SeamConversationWizard">
- <enablement>
- <or>
- <adapt type="org.eclipse.core.resources.IFile" />
- <adapt type="org.eclipse.core.resources.IFolder" />
- <adapt type="org.eclipse.core.resources.IProject" />
- <adapt type="org.eclipse.core.resources.IWorkspaceRoot" />
- <instanceof value="org.jboss.tools.seam.core.ISeamElement"/>
- </or>
- </enablement>
- </commonWizard>
-
- <commonWizard
- menuGroupId="org.jboss.tools.seam.ui"
- type="new"
- wizardId="org.jboss.tools.seam.ui.wizard.SeamEntityWizard">
- <enablement>
- <or>
- <adapt type="org.eclipse.core.resources.IFile" />
- <adapt type="org.eclipse.core.resources.IFolder" />
- <adapt type="org.eclipse.core.resources.IProject" />
- <adapt type="org.eclipse.core.resources.IWorkspaceRoot" />
- <instanceof value="org.jboss.tools.seam.core.ISeamElement"/>
- </or>
- </enablement>
- </commonWizard>
-
- <commonWizard
- menuGroupId="org.jboss.tools.seam.ui"
- type="new"
- wizardId="org.jboss.tools.seam.ui.wizard.SeamFormWizard">
- <enablement>
- <or>
- <adapt type="org.eclipse.core.resources.IFile" />
- <adapt type="org.eclipse.core.resources.IFolder" />
- <adapt type="org.eclipse.core.resources.IProject" />
- <adapt type="org.eclipse.core.resources.IWorkspaceRoot" />
- <instanceof value="org.jboss.tools.seam.core.ISeamElement"/>
- </or>
- </enablement>
- </commonWizard>
-
- <commonWizard
- menuGroupId="org.jboss.tools.seam.ui"
- type="new"
- wizardId="org.jboss.tools.seam.ui.wizard.SeamGenerateEnitiesWizard">
- <enablement>
- <or>
- <adapt type="org.eclipse.core.resources.IFile" />
- <adapt type="org.eclipse.core.resources.IFolder" />
- <adapt type="org.eclipse.core.resources.IProject" />
- <adapt type="org.eclipse.core.resources.IWorkspaceRoot" />
- <instanceof value="org.jboss.tools.seam.core.ISeamElement"/>
- </or>
- </enablement>
- </commonWizard>
-
<commonWizard
type="new"
wizardId="org.eclipse.ui.wizards.new.folder">
@@ -473,20 +383,27 @@
<enablement>
</enablement>
</actionProvider>
+ </navigatorContent>
- <commonWizard
+ <commonWizard
menuGroupId="org.jboss.tools.seam.ui"
type="new"
wizardId="org.jboss.tools.seam.ui.wizard.SeamActionWizard">
<enablement>
- <or>
- <instanceof value="org.eclipse.jdt.core.IPackageFragment"/>
- <instanceof value="org.eclipse.jdt.core.IPackageFragmentRoot"/>
- <instanceof value="org.eclipse.jdt.core.ICompilationUnit"/>
- <adapt type="org.eclipse.core.resources.IProject">
- <test property="org.eclipse.core.resources.projectNature" value="org.jboss.tools.seam.core.seamnature"/>
- </adapt>
- </or>
+ <and>
+ <or>
+ <instanceof value="org.eclipse.jdt.core.IPackageFragment"/>
+ <instanceof value="org.eclipse.jdt.core.IPackageFragmentRoot"/>
+ <instanceof value="org.eclipse.jdt.core.ICompilationUnit"/>
+ <instanceof value="org.jboss.tools.seam.core.ISeamElement"/>
+ <adapt type="org.eclipse.core.resources.IProject">
+ <test property="org.eclipse.core.resources.projectNature" value="org.jboss.tools.seam.core.seamnature"/>
+ </adapt>
+ </or>
+ <adapt type="org.eclipse.core.resources.IResource">
+ <test property="org.eclipse.core.resources.projectNature" value="org.jboss.tools.seam.core.seamnature"/>
+ </adapt>
+ </and>
</enablement>
</commonWizard>
@@ -495,14 +412,20 @@
type="new"
wizardId="org.jboss.tools.seam.ui.wizard.SeamConversationWizard">
<enablement>
- <or>
- <instanceof value="org.eclipse.jdt.core.IPackageFragment"/>
- <instanceof value="org.eclipse.jdt.core.IPackageFragmentRoot"/>
- <instanceof value="org.eclipse.jdt.core.ICompilationUnit"/>
- <adapt type="org.eclipse.core.resources.IProject">
- <test property="org.eclipse.core.resources.projectNature" value="org.jboss.tools.seam.core.seamnature"/>
- </adapt>
- </or>
+ <and>
+ <or>
+ <instanceof value="org.eclipse.jdt.core.IPackageFragment"/>
+ <instanceof value="org.eclipse.jdt.core.IPackageFragmentRoot"/>
+ <instanceof value="org.eclipse.jdt.core.ICompilationUnit"/>
+ <instanceof value="org.jboss.tools.seam.core.ISeamElement"/>
+ <adapt type="org.eclipse.core.resources.IProject">
+ <test property="org.eclipse.core.resources.projectNature" value="org.jboss.tools.seam.core.seamnature"/>
+ </adapt>
+ </or>
+ <adapt type="org.eclipse.core.resources.IResource">
+ <test property="org.eclipse.core.resources.projectNature" value="org.jboss.tools.seam.core.seamnature"/>
+ </adapt>
+ </and>
</enablement>
</commonWizard>
@@ -511,14 +434,20 @@
type="new"
wizardId="org.jboss.tools.seam.ui.wizard.SeamEntityWizard">
<enablement>
- <or>
- <instanceof value="org.eclipse.jdt.core.IPackageFragment"/>
- <instanceof value="org.eclipse.jdt.core.IPackageFragmentRoot"/>
- <instanceof value="org.eclipse.jdt.core.ICompilationUnit"/>
- <adapt type="org.eclipse.core.resources.IProject">
- <test property="org.eclipse.core.resources.projectNature" value="org.jboss.tools.seam.core.seamnature"/>
- </adapt>
- </or>
+ <and>
+ <or>
+ <instanceof value="org.eclipse.jdt.core.IPackageFragment"/>
+ <instanceof value="org.eclipse.jdt.core.IPackageFragmentRoot"/>
+ <instanceof value="org.eclipse.jdt.core.ICompilationUnit"/>
+ <instanceof value="org.jboss.tools.seam.core.ISeamElement"/>
+ <adapt type="org.eclipse.core.resources.IProject">
+ <test property="org.eclipse.core.resources.projectNature" value="org.jboss.tools.seam.core.seamnature"/>
+ </adapt>
+ </or>
+ <adapt type="org.eclipse.core.resources.IResource">
+ <test property="org.eclipse.core.resources.projectNature" value="org.jboss.tools.seam.core.seamnature"/>
+ </adapt>
+ </and>
</enablement>
</commonWizard>
@@ -527,14 +456,20 @@
type="new"
wizardId="org.jboss.tools.seam.ui.wizard.SeamFormWizard">
<enablement>
- <or>
- <instanceof value="org.eclipse.jdt.core.IPackageFragment"/>
- <instanceof value="org.eclipse.jdt.core.IPackageFragmentRoot"/>
- <instanceof value="org.eclipse.jdt.core.ICompilationUnit"/>
- <adapt type="org.eclipse.core.resources.IProject">
- <test property="org.eclipse.core.resources.projectNature" value="org.jboss.tools.seam.core.seamnature"/>
- </adapt>
- </or>
+ <and>
+ <or>
+ <instanceof value="org.eclipse.jdt.core.IPackageFragment"/>
+ <instanceof value="org.eclipse.jdt.core.IPackageFragmentRoot"/>
+ <instanceof value="org.eclipse.jdt.core.ICompilationUnit"/>
+ <instanceof value="org.jboss.tools.seam.core.ISeamElement"/>
+ <adapt type="org.eclipse.core.resources.IProject">
+ <test property="org.eclipse.core.resources.projectNature" value="org.jboss.tools.seam.core.seamnature"/>
+ </adapt>
+ </or>
+ <adapt type="org.eclipse.core.resources.IResource">
+ <test property="org.eclipse.core.resources.projectNature" value="org.jboss.tools.seam.core.seamnature"/>
+ </adapt>
+ </and>
</enablement>
</commonWizard>
@@ -543,18 +478,23 @@
type="new"
wizardId="org.jboss.tools.seam.ui.wizard.SeamGenerateEnitiesWizard">
<enablement>
- <or>
- <instanceof value="org.eclipse.jdt.core.IPackageFragment"/>
- <instanceof value="org.eclipse.jdt.core.IPackageFragmentRoot"/>
- <instanceof value="org.eclipse.jdt.core.ICompilationUnit"/>
- <adapt type="org.eclipse.core.resources.IProject">
- <test property="org.eclipse.core.resources.projectNature" value="org.jboss.tools.seam.core.seamnature"/>
- </adapt>
- </or>
+ <and>
+ <or>
+ <instanceof value="org.eclipse.jdt.core.IPackageFragment"/>
+ <instanceof value="org.eclipse.jdt.core.IPackageFragmentRoot"/>
+ <instanceof value="org.eclipse.jdt.core.ICompilationUnit"/>
+ <instanceof value="org.jboss.tools.seam.core.ISeamElement"/>
+ <adapt type="org.eclipse.core.resources.IProject">
+ <test property="org.eclipse.core.resources.projectNature" value="org.jboss.tools.seam.core.seamnature"/>
+ </adapt>
+ </or>
+ <adapt type="org.eclipse.core.resources.IResource">
+ <test property="org.eclipse.core.resources.projectNature" value="org.jboss.tools.seam.core.seamnature"/>
+ </adapt>
+ </and>
</enablement>
</commonWizard>
- </navigatorContent>
</extension>
<extension
13 years, 12 months
- 1
- 0
JBoss Tools SVN: r40187 - in trunk/modeshape/plugins/org.jboss.tools.modeshape.ui/src/org/jboss/tools/modeshape/ui: forms and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: elvisisking
Date: 2012-04-13 17:01:21 -0400 (Fri, 13 Apr 2012)
New Revision: 40187
Modified:
trunk/modeshape/plugins/org.jboss.tools.modeshape.ui/src/org/jboss/tools/modeshape/ui/UiMessages.java
trunk/modeshape/plugins/org.jboss.tools.modeshape.ui/src/org/jboss/tools/modeshape/ui/UiUtils.java
trunk/modeshape/plugins/org.jboss.tools.modeshape.ui/src/org/jboss/tools/modeshape/ui/forms/MessageSummaryDialog.java
trunk/modeshape/plugins/org.jboss.tools.modeshape.ui/src/org/jboss/tools/modeshape/ui/graphics/GraphicsUtils.java
trunk/modeshape/plugins/org.jboss.tools.modeshape.ui/src/org/jboss/tools/modeshape/ui/uiMessages.properties
Log:
JBIDE-11528 Add Option To CND Validation Message Dialog To Export The Validation Messages To A Workspace File. Messages can now be exported to a file sytem file.
Modified: trunk/modeshape/plugins/org.jboss.tools.modeshape.ui/src/org/jboss/tools/modeshape/ui/UiMessages.java
===================================================================
--- trunk/modeshape/plugins/org.jboss.tools.modeshape.ui/src/org/jboss/tools/modeshape/ui/UiMessages.java 2012-04-13 21:00:42 UTC (rev 40186)
+++ trunk/modeshape/plugins/org.jboss.tools.modeshape.ui/src/org/jboss/tools/modeshape/ui/UiMessages.java 2012-04-13 21:01:21 UTC (rev 40187)
@@ -20,6 +20,26 @@
public static String errorDialogTitle;
/**
+ * A message for a button for exporting data to a file.
+ */
+ public static String export;
+
+ /**
+ * The name of the default file name for the dialog that exports messages to a file.
+ */
+ public static String exportMessagesDialogDefaultFileName;
+
+ /**
+ * A title of the exports messages to a file dialog.
+ */
+ public static String exportMessagesDialogTitle;
+
+ /**
+ * A tooltip for a control that exports messages to a file.
+ */
+ public static String exportMessagesToolTip;
+
+ /**
* The title of a generic information message dialog.
*/
public static String infoDialogTitle;
@@ -30,11 +50,22 @@
public static String messageColumnHeader;
/**
+ * A message indicating a <code>null</code> was found. One parameter, a string identifying the object, is required.
+ */
+ public static String objectIsNull;
+
+ /**
* The title of a generic question message dialog.
*/
public static String questionDialogTitle;
/**
+ * A message indicating a <code>null</code> or empty string was found. One parameter, a name identifying the string, is
+ * required.
+ */
+ public static String stringIsEmpty;
+
+ /**
* The title of a generic warning message dialog.
*/
public static String warningDialogTitle;
Modified: trunk/modeshape/plugins/org.jboss.tools.modeshape.ui/src/org/jboss/tools/modeshape/ui/UiUtils.java
===================================================================
--- trunk/modeshape/plugins/org.jboss.tools.modeshape.ui/src/org/jboss/tools/modeshape/ui/UiUtils.java 2012-04-13 21:00:42 UTC (rev 40186)
+++ trunk/modeshape/plugins/org.jboss.tools.modeshape.ui/src/org/jboss/tools/modeshape/ui/UiUtils.java 2012-04-13 21:01:21 UTC (rev 40187)
@@ -13,6 +13,7 @@
import org.eclipse.jface.viewers.CellLabelProvider;
import org.eclipse.jface.viewers.TableViewer;
import org.eclipse.jface.viewers.TableViewerColumn;
+import org.eclipse.osgi.util.NLS;
import org.eclipse.swt.widgets.TableColumn;
/**
@@ -35,10 +36,11 @@
*
* @param viewerColumn the viewer column (cannot be <code>null</code>)
* @param labelProvider the column label provider (cannot be <code>null</code>
- * @param headerText the header text (cannot be <code>null</code>)
- * @param headerToolTip (can be <code>null</code>)
+ * @param headerText the header text (can be <code>null</code> or empty)
+ * @param headerToolTip (can be <code>null</code> or empty)
* @param moveable a flag indicating if the column can be moved
* @param resizable a flag indicating if the column can be resized
+ * @throws IllegalArgumentException if either the column or label provider is <code>null</code>
*/
public static void configureColumn( final TableViewerColumn viewerColumn,
final CellLabelProvider labelProvider,
@@ -46,11 +48,18 @@
final String headerToolTip,
final boolean moveable,
final boolean resizable ) {
+ verifyIsNotNull(viewerColumn, "viewerColumn"); //$NON-NLS-1$
+ verifyIsNotNull(labelProvider, "labelProvider"); //$NON-NLS-1$
+
viewerColumn.setLabelProvider(labelProvider);
// configure column
final TableColumn column = viewerColumn.getColumn();
- column.setText(headerText);
+
+ if (!isEmpty(headerText)) {
+ column.setText(headerText);
+ }
+
column.setToolTipText(headerToolTip);
column.setMoveable(false);
column.setResizable(resizable);
@@ -76,9 +85,7 @@
*/
public static String join( Collection<?> items,
String delimiter ) {
- if (items == null) {
- throw new IllegalArgumentException("items is null"); //$NON-NLS-1$
- }
+ verifyIsNotNull(items, "items"); //$NON-NLS-1$
delimiter = (((delimiter == null) || delimiter.isEmpty()) ? DEFAULT_JOIN_DELIMITER : delimiter);
StringBuilder builder = new StringBuilder();
@@ -103,9 +110,12 @@
/**
* @param viewers the viewers whose columns will be packed (cannot be <code>null</code>)
+ * @throws IllegalArgumentException if a viewer is <code>null</code>
*/
public static void pack( final TableViewer... viewers ) {
for (final TableViewer viewer : viewers) {
+ verifyIsNotNull(viewer, "viewer"); //$NON-NLS-1$
+
for (final TableColumn column : viewer.getTable().getColumns()) {
column.pack();
}
@@ -113,6 +123,38 @@
}
/**
+ * @param text the string being checked (can be <code>null</code> or empty)
+ * @param name the name of the object to use in the error message (cannot be <code>null</code>)
+ * @throws IllegalArgumentException if the text is <code>null</code> or empty
+ */
+ public static void verifyIsNotEmpty( final String text,
+ String name ) {
+ if (isEmpty(text)) {
+ if ((name == null) || name.isEmpty()) {
+ name = EMPTY_STRING;
+ }
+
+ throw new IllegalArgumentException(NLS.bind(UiMessages.stringIsEmpty, name));
+ }
+ }
+
+ /**
+ * @param object the object being checked (can be <code>null</code>)
+ * @param name the name of the object to use in the error message (cannot be <code>null</code>)
+ * @throws IllegalArgumentException if the object is <code>null</code>
+ */
+ public static void verifyIsNotNull( final Object object,
+ String name ) {
+ if (object == null) {
+ if ((name == null) || name.isEmpty()) {
+ name = EMPTY_STRING;
+ }
+
+ throw new IllegalArgumentException(NLS.bind(UiMessages.objectIsNull, name));
+ }
+ }
+
+ /**
* Don't allow construction.
*/
private UiUtils() {
Modified: trunk/modeshape/plugins/org.jboss.tools.modeshape.ui/src/org/jboss/tools/modeshape/ui/forms/MessageSummaryDialog.java
===================================================================
--- trunk/modeshape/plugins/org.jboss.tools.modeshape.ui/src/org/jboss/tools/modeshape/ui/forms/MessageSummaryDialog.java 2012-04-13 21:00:42 UTC (rev 40186)
+++ trunk/modeshape/plugins/org.jboss.tools.modeshape.ui/src/org/jboss/tools/modeshape/ui/forms/MessageSummaryDialog.java 2012-04-13 21:01:21 UTC (rev 40187)
@@ -7,6 +7,11 @@
*/
package org.jboss.tools.modeshape.ui.forms;
+import java.io.BufferedWriter;
+import java.io.FileWriter;
+
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.Status;
import org.eclipse.jface.dialogs.IDialogConstants;
import org.eclipse.jface.dialogs.IMessageProvider;
import org.eclipse.jface.viewers.IStructuredContentProvider;
@@ -15,9 +20,13 @@
import org.eclipse.jface.viewers.TableViewerColumn;
import org.eclipse.jface.viewers.Viewer;
import org.eclipse.swt.SWT;
+import org.eclipse.swt.events.SelectionAdapter;
+import org.eclipse.swt.events.SelectionEvent;
import org.eclipse.swt.layout.GridData;
import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.widgets.Button;
import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.FileDialog;
import org.eclipse.swt.widgets.Shell;
import org.eclipse.swt.widgets.Table;
import org.eclipse.ui.forms.FormDialog;
@@ -25,6 +34,8 @@
import org.eclipse.ui.forms.IMessage;
import org.eclipse.ui.forms.widgets.FormToolkit;
import org.eclipse.ui.forms.widgets.ScrolledForm;
+import org.jboss.tools.modeshape.ui.Activator;
+import org.jboss.tools.modeshape.ui.UiConstants;
import org.jboss.tools.modeshape.ui.UiMessages;
import org.jboss.tools.modeshape.ui.UiUtils;
@@ -48,12 +59,14 @@
* @param messages the messages being displayed (cannot be <code>null</code>)
*/
public MessageSummaryDialog( final Shell parent,
- final String dialogTitle,
- final String messageAreaTitle,
- final String messageAreaMessage,
- final int messageType,
- final IMessage[] messages ) {
+ final String dialogTitle,
+ final String messageAreaTitle,
+ final String messageAreaMessage,
+ final int messageType,
+ final IMessage[] messages ) {
super(parent);
+ UiUtils.verifyIsNotNull(messages, "messages"); //$NON-NLS-1$
+
this.dialogTitle = dialogTitle;
this.messages = messages;
this.messageAreaTitle = messageAreaTitle;
@@ -69,7 +82,7 @@
@Override
protected void configureShell( final Shell newShell ) {
super.configureShell(newShell);
- newShell.setText(this.dialogTitle);
+ newShell.setText(dialogTitle);
}
/**
@@ -78,8 +91,24 @@
* @see org.eclipse.jface.dialogs.Dialog#createButtonsForButtonBar(org.eclipse.swt.widgets.Composite)
*/
@Override
- protected void createButtonsForButtonBar( Composite parent ) {
+ protected void createButtonsForButtonBar( final Composite parent ) {
createButton(parent, IDialogConstants.OK_ID, IDialogConstants.OK_LABEL, true);
+
+ // export button
+ final Button btn = createButton(parent, IDialogConstants.CLIENT_ID, UiMessages.export, false);
+ btn.setToolTipText(UiMessages.exportMessagesToolTip);
+ btn.addSelectionListener(new SelectionAdapter() {
+
+ /**
+ * {@inheritDoc}
+ *
+ * @see org.eclipse.swt.events.SelectionAdapter#widgetSelected(org.eclipse.swt.events.SelectionEvent)
+ */
+ @Override
+ public void widgetSelected( final SelectionEvent e ) {
+ handleExportMessages();
+ }
+ });
}
/**
@@ -90,8 +119,8 @@
@Override
protected void createFormContent( final IManagedForm managedForm ) {
final ScrolledForm scrolledForm = managedForm.getForm();
- scrolledForm.setText(this.messageAreaTitle); // set header area title
- scrolledForm.setMessage(this.messageAreaMessage, this.messageType, this.messages);
+ scrolledForm.setText(messageAreaTitle); // set header area title
+ scrolledForm.setMessage(messageAreaMessage, messageType, messages);
scrolledForm.getBody().setLayout(new GridLayout());
scrolledForm.getBody().setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true));
@@ -101,7 +130,7 @@
container.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true));
toolkit.paintBordersFor(container);
- int count = this.messages.length;
+ int count = messages.length;
if (count > 20) {
count = 20;
@@ -175,6 +204,51 @@
}
IMessage[] getMessages() {
- return this.messages;
+ return messages;
}
+
+ void handleExportMessages() {
+ final FileDialog dlg = new FileDialog(getShell(), SWT.SAVE);
+ dlg.setFilterExtensions(new String[] { "*.txt" }); //$NON-NLS-1$
+ dlg.setText(UiMessages.exportMessagesDialogTitle);
+ dlg.setFileName(UiMessages.exportMessagesDialogDefaultFileName);
+ final String fileName = dlg.open();
+
+ if (fileName != null) {
+ final String delim = " - "; //$NON-NLS-1$
+ final StringBuilder builder = new StringBuilder();
+
+ for (final IMessage message : messages) {
+ final int messageType = message.getMessageType();
+
+ if (messageType == IMessageProvider.ERROR) {
+ builder.append(UiMessages.errorDialogTitle).append(delim);
+ } else if (messageType == IMessageProvider.WARNING) {
+ builder.append(UiMessages.errorDialogTitle).append(delim);
+ } else if (messageType == IMessageProvider.INFORMATION) {
+ builder.append(UiMessages.errorDialogTitle).append(delim);
+ }
+
+ builder.append(message.getMessage()).append('\n');
+ }
+
+ BufferedWriter out = null;
+
+ try {
+ out = new BufferedWriter(new FileWriter(fileName));
+ out.write(builder.toString());
+ out.flush();
+ } catch (final Exception e) {
+ Activator.getSharedInstance().getLog().log(new Status(IStatus.ERROR, UiConstants.PLUGIN_ID, null, e));
+ } finally {
+ try {
+ if (out != null) {
+ out.close();
+ }
+ } catch (final java.io.IOException e) {
+ // ignore
+ }
+ }
+ }
+ }
}
Modified: trunk/modeshape/plugins/org.jboss.tools.modeshape.ui/src/org/jboss/tools/modeshape/ui/graphics/GraphicsUtils.java
===================================================================
--- trunk/modeshape/plugins/org.jboss.tools.modeshape.ui/src/org/jboss/tools/modeshape/ui/graphics/GraphicsUtils.java 2012-04-13 21:00:42 UTC (rev 40186)
+++ trunk/modeshape/plugins/org.jboss.tools.modeshape.ui/src/org/jboss/tools/modeshape/ui/graphics/GraphicsUtils.java 2012-04-13 21:01:21 UTC (rev 40187)
@@ -11,6 +11,7 @@
import org.eclipse.jface.resource.ImageRegistry;
import org.eclipse.swt.graphics.Image;
import org.eclipse.ui.plugin.AbstractUIPlugin;
+import org.jboss.tools.modeshape.ui.UiUtils;
/**
*
@@ -35,9 +36,12 @@
* @param uiPlugin the UI Plug-in instance (cannot be <code>null</code>)
* @param pathToImage the path to the image file relative to the specified plug-in's folder (can be <code>null</code>)
* @return the requested image or a standard "missing image" image (never <code>null</code>)
+ * @throws IllegalArgumentException if the plugin is <code>null</code>
*/
public static final Image getImage( final AbstractUIPlugin uiPlugin,
final String pathToImage ) {
+ UiUtils.verifyIsNotNull(uiPlugin, "uiPlugin"); //$NON-NLS-1$
+
final ImageRegistry imageRegistry = uiPlugin.getImageRegistry();
Image image = imageRegistry.get(pathToImage);
Modified: trunk/modeshape/plugins/org.jboss.tools.modeshape.ui/src/org/jboss/tools/modeshape/ui/uiMessages.properties
===================================================================
--- trunk/modeshape/plugins/org.jboss.tools.modeshape.ui/src/org/jboss/tools/modeshape/ui/uiMessages.properties 2012-04-13 21:00:42 UTC (rev 40186)
+++ trunk/modeshape/plugins/org.jboss.tools.modeshape.ui/src/org/jboss/tools/modeshape/ui/uiMessages.properties 2012-04-13 21:01:21 UTC (rev 40187)
@@ -5,7 +5,13 @@
# See the AUTHORS.txt file distributed with this work for a full listing of individual contributors.
errorDialogTitle = Error
+export = Export
+exportMessagesDialogDefaultFileName = messages.txt
+exportMessagesDialogTitle = Export Messages
+exportMessagesToolTip = Save messages to a workspace file
infoDialogTitle = Info
messageColumnHeader = Message
+objectIsNull = Object {0} is null
questionDialogTitle = Question
+stringIsEmpty = String {0} is empty
warningDialogTitle = Warning
\ No newline at end of file
13 years, 12 months
- 1
- 0
JBoss Tools SVN: r40186 - in trunk/modeshape: plugins/org.jboss.tools.modeshape.jcr.ui/META-INF and 4 other directories.
by jbosstools-commits＠lists.jboss.org
Author: elvisisking
Date: 2012-04-13 17:00:42 -0400 (Fri, 13 Apr 2012)
New Revision: 40186
Modified:
trunk/modeshape/plugins/org.jboss.tools.modeshape.client/META-INF/MANIFEST.MF
trunk/modeshape/plugins/org.jboss.tools.modeshape.jcr.ui/META-INF/MANIFEST.MF
trunk/modeshape/plugins/org.jboss.tools.modeshape.jcr.ui/src/org/jboss/tools/modeshape/jcr/ui/preferences/CndPreferencePage.java
trunk/modeshape/plugins/org.jboss.tools.modeshape.rest/.classpath
trunk/modeshape/plugins/org.jboss.tools.modeshape.rest/META-INF/MANIFEST.MF
trunk/modeshape/plugins/org.jboss.tools.modeshape.rest/build.properties
trunk/modeshape/tests/org.jboss.tools.modeshape.rest.test/META-INF/MANIFEST.MF
Log:
JBIDE-11538 Remove ModeShape Client JAR From ModeShape Tools REST Plugin And Add Dependency To ModeShape Tools Client Plugin. A new binary plugin with the client jar used by ModeShape Tools now exists. So removed the JAR and added dependency to this new plugin.
Modified: trunk/modeshape/plugins/org.jboss.tools.modeshape.client/META-INF/MANIFEST.MF
===================================================================
--- trunk/modeshape/plugins/org.jboss.tools.modeshape.client/META-INF/MANIFEST.MF 2012-04-13 18:24:03 UTC (rev 40185)
+++ trunk/modeshape/plugins/org.jboss.tools.modeshape.client/META-INF/MANIFEST.MF 2012-04-13 21:00:42 UTC (rev 40186)
@@ -17,6 +17,86 @@
javax.jcr.security,
javax.jcr.util,
javax.jcr.version,
+ javax.ws.rs,
+ javax.ws.rs.core,
+ javax.ws.rs.ext,
+ org.apache.commons.codec,
+ org.apache.commons.codec.binary,
+ org.apache.commons.codec.digest,
+ org.apache.commons.codec.language,
+ org.apache.commons.codec.net,
+ org.apache.commons.logging,
+ org.apache.commons.logging.impl,
+ org.apache.http,
+ org.apache.http.auth,
+ org.apache.http.auth.params,
+ org.apache.http.client,
+ org.apache.http.client.entity,
+ org.apache.http.client.methods,
+ org.apache.http.client.params,
+ org.apache.http.client.protocol,
+ org.apache.http.client.utils,
+ org.apache.http.conn,
+ org.apache.http.conn.params,
+ org.apache.http.conn.routing,
+ org.apache.http.conn.scheme,
+ org.apache.http.conn.ssl,
+ org.apache.http.conn.util,
+ org.apache.http.cookie,
+ org.apache.http.cookie.params,
+ org.apache.http.entity,
+ org.apache.http.impl,
+ org.apache.http.impl.auth,
+ org.apache.http.impl.client,
+ org.apache.http.impl.conn,
+ org.apache.http.impl.conn.tsccm,
+ org.apache.http.impl.cookie,
+ org.apache.http.impl.entity,
+ org.apache.http.impl.io,
+ org.apache.http.io,
+ org.apache.http.message,
+ org.apache.http.params,
+ org.apache.http.protocol,
+ org.apache.http.util,
+ org.codehaus.jettison,
+ org.codehaus.jettison.badgerfish,
+ org.codehaus.jettison.json,
+ org.codehaus.jettison.mapped,
+ org.codehaus.jettison.util,
+ org.jboss.resteasy.annotations,
+ org.jboss.resteasy.annotations.cache,
+ org.jboss.resteasy.annotations.interception,
+ org.jboss.resteasy.annotations.providers.img,
+ org.jboss.resteasy.annotations.providers.jaxb,
+ org.jboss.resteasy.annotations.providers.jaxb.json,
+ org.jboss.resteasy.client,
+ org.jboss.resteasy.client.cache,
+ org.jboss.resteasy.client.core,
+ org.jboss.resteasy.client.core.executors,
+ org.jboss.resteasy.client.core.marshallers,
+ org.jboss.resteasy.core,
+ org.jboss.resteasy.core.interception,
+ org.jboss.resteasy.core.messagebody,
+ org.jboss.resteasy.core.registry,
+ org.jboss.resteasy.core.request,
+ org.jboss.resteasy.mock,
+ org.jboss.resteasy.plugins.delegates,
+ org.jboss.resteasy.plugins.interceptors,
+ org.jboss.resteasy.plugins.interceptors.encoding,
+ org.jboss.resteasy.plugins.providers,
+ org.jboss.resteasy.plugins.providers.jaxb,
+ org.jboss.resteasy.plugins.providers.jaxb.json,
+ org.jboss.resteasy.plugins.server.embedded,
+ org.jboss.resteasy.plugins.server.resourcefactory,
+ org.jboss.resteasy.plugins.server.servlet,
+ org.jboss.resteasy.plugins.server.tjws,
+ org.jboss.resteasy.plugins.stats,
+ org.jboss.resteasy.specimpl,
+ org.jboss.resteasy.spi,
+ org.jboss.resteasy.spi.interception,
+ org.jboss.resteasy.spi.touri,
+ org.jboss.resteasy.test,
+ org.jboss.resteasy.util,
org.modeshape.common,
org.modeshape.common.annotation,
org.modeshape.common.collection,
@@ -40,4 +120,7 @@
org.modeshape.web.jcr.rest.client,
org.modeshape.web.jcr.rest.client.domain,
org.modeshape.web.jcr.rest.client.http,
- org.modeshape.web.jcr.rest.client.json
+ org.modeshape.web.jcr.rest.client.json,
+ org.slf4j,
+ org.slf4j.helpers,
+ org.slf4j.spi
Modified: trunk/modeshape/plugins/org.jboss.tools.modeshape.jcr.ui/META-INF/MANIFEST.MF
===================================================================
--- trunk/modeshape/plugins/org.jboss.tools.modeshape.jcr.ui/META-INF/MANIFEST.MF 2012-04-13 18:24:03 UTC (rev 40185)
+++ trunk/modeshape/plugins/org.jboss.tools.modeshape.jcr.ui/META-INF/MANIFEST.MF 2012-04-13 21:00:42 UTC (rev 40186)
@@ -15,5 +15,5 @@
org.eclipse.ui.editors,
org.eclipse.jface.text,
org.eclipse.ui.ide,
- org.jboss.tools.modeshape.client;bundle-version="1.1.0"
+ org.jboss.tools.modeshape.client
Bundle-Activator: org.jboss.tools.modeshape.jcr.ui.Activator
Modified: trunk/modeshape/plugins/org.jboss.tools.modeshape.jcr.ui/src/org/jboss/tools/modeshape/jcr/ui/preferences/CndPreferencePage.java
===================================================================
--- trunk/modeshape/plugins/org.jboss.tools.modeshape.jcr.ui/src/org/jboss/tools/modeshape/jcr/ui/preferences/CndPreferencePage.java 2012-04-13 18:24:03 UTC (rev 40185)
+++ trunk/modeshape/plugins/org.jboss.tools.modeshape.jcr.ui/src/org/jboss/tools/modeshape/jcr/ui/preferences/CndPreferencePage.java 2012-04-13 21:00:42 UTC (rev 40186)
@@ -31,10 +31,10 @@
*
*/
public final class CndPreferencePage extends PreferencePage implements IWorkbenchPreferencePage {
+//
+// private static String[] QUOTE_CHAR_LABELS = new String[] { CndMessages.quoteCharNoneChoiceLabel,
+// CndMessages.quoteCharSingleChoiceLabel, CndMessages.quoteCharDoubleChoiceLabel };
- private static String[] QUOTE_CHAR_LABELS = new String[] { CndMessages.quoteCharNoneChoiceLabel,
- CndMessages.quoteCharSingleChoiceLabel, CndMessages.quoteCharDoubleChoiceLabel };
-
/**
* The editor used to choose the notation type for the CND format.
*/
Modified: trunk/modeshape/plugins/org.jboss.tools.modeshape.rest/.classpath
===================================================================
--- trunk/modeshape/plugins/org.jboss.tools.modeshape.rest/.classpath 2012-04-13 18:24:03 UTC (rev 40185)
+++ trunk/modeshape/plugins/org.jboss.tools.modeshape.rest/.classpath 2012-04-13 21:00:42 UTC (rev 40186)
@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry exported="true" kind="lib" path="modeshape-client.jar"/>
<classpathentry exported="true" kind="lib" path="jcip-annotations.jar"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
Modified: trunk/modeshape/plugins/org.jboss.tools.modeshape.rest/META-INF/MANIFEST.MF
===================================================================
--- trunk/modeshape/plugins/org.jboss.tools.modeshape.rest/META-INF/MANIFEST.MF 2012-04-13 18:24:03 UTC (rev 40185)
+++ trunk/modeshape/plugins/org.jboss.tools.modeshape.rest/META-INF/MANIFEST.MF 2012-04-13 21:00:42 UTC (rev 40186)
@@ -13,16 +13,12 @@
org.eclipse.jface.text,
org.eclipse.debug.ui,
org.jboss.tools.usage;bundle-version="1.0.0";resolution:=optional,
- org.eclipse.ui.views
+ org.eclipse.ui.views,
+ org.jboss.tools.modeshape.client
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Bundle-ActivationPolicy: lazy
-Bundle-ClassPath: modeshape-client.jar,
- jcip-annotations.jar,
+Bundle-ClassPath: jcip-annotations.jar,
.
-Export-Package: javax.jcr.nodetype,
- org.jboss.tools.modeshape.rest,
+Export-Package: org.jboss.tools.modeshape.rest,
org.jboss.tools.modeshape.rest.domain,
- org.jboss.tools.modeshape.rest.preferences,
- org.modeshape.common.i18n,
- org.modeshape.web.jcr.rest.client,
- org.modeshape.web.jcr.rest.client.domain
+ org.jboss.tools.modeshape.rest.preferences
Modified: trunk/modeshape/plugins/org.jboss.tools.modeshape.rest/build.properties
===================================================================
--- trunk/modeshape/plugins/org.jboss.tools.modeshape.rest/build.properties 2012-04-13 18:24:03 UTC (rev 40185)
+++ trunk/modeshape/plugins/org.jboss.tools.modeshape.rest/build.properties 2012-04-13 21:00:42 UTC (rev 40186)
@@ -21,7 +21,6 @@
.,\
about.html,\
jcip-annotations.jar,\
- modeshape-client.jar,\
.options
jars.compile.order = .
source.. = src/
Modified: trunk/modeshape/tests/org.jboss.tools.modeshape.rest.test/META-INF/MANIFEST.MF
===================================================================
--- trunk/modeshape/tests/org.jboss.tools.modeshape.rest.test/META-INF/MANIFEST.MF 2012-04-13 18:24:03 UTC (rev 40185)
+++ trunk/modeshape/tests/org.jboss.tools.modeshape.rest.test/META-INF/MANIFEST.MF 2012-04-13 21:00:42 UTC (rev 40186)
@@ -5,7 +5,8 @@
Bundle-Version: 1.1.0.qualifier
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Require-Bundle: org.jboss.tools.modeshape.rest,
- org.junit4
+ org.junit4,
+ org.jboss.tools.modeshape.client
Bundle-ClassPath: hamcrest-core-1.1.jar,
.,
junit-4.4.jar
13 years, 12 months
- 1
- 0
JBoss Tools SVN: r40185 - in trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim: resources/config and 3 other directories.
by jbosstools-commits＠lists.jboss.org
Author: yradtsevich
Date: 2012-04-13 14:24:03 -0400 (Fri, 13 Apr 2012)
New Revision: 40185
Added:
trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/resources/android/back-selected.png
trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/resources/android/back.png
trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/resources/android/forward-selected.png
trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/resources/android/forward.png
trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/resources/android/home-selected.png
trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/resources/android/home.png
trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/resources/android/nav-1.png
trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/resources/android/nav-2.png
trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/resources/android/nav-3.png
trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/resources/android/refresh-selected.png
trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/resources/android/refresh.png
trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/resources/android/stop-selected.png
trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/resources/android/stop.png
trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/resources/android/time-1.png
trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/resources/android/time-2.png
trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/resources/android/time-3.png
trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/ui/skin/AbstractTimeComposite.java
trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/ui/skin/DeviceComposite.java
trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/ui/skin/ImageButtonComposite.java
trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/ui/skin/ImageDescriptor.java
trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/ui/skin/WidgetDescriptor.java
trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/ui/skin/android/AndroidComposite.java
trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/ui/skin/android/AndroidNavBarComposite.java
trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/ui/skin/android/AndroidSkinDescriptor.java
trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/ui/skin/android/AndroidTimeComposite.java
Removed:
trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/ui/skin/ios/ImageButtonComposite.java
trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/ui/skin/ios/ImageDescriptor.java
trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/ui/skin/ios/WidgetDescriptor.java
Modified:
trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/resources/config/devices.cfg
trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/ui/skin/android/AndroidResizableSkin.java
trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/ui/skin/ios/AppleIPhone3ResizableSkin.java
trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/ui/skin/ios/AppleIPhoneComposite.java
trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/ui/skin/ios/IOSNavBarComposite.java
trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/ui/skin/ios/IOsTimeComposite.java
trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/ui/skin/ios/IPhoneSkinDescriptor.java
Log:
JBIDE-10945 BrowserSim: create more skins
- created Android screen
Added: trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/resources/android/back-selected.png
===================================================================
(Binary files differ)
Property changes on: trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/resources/android/back-selected.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/resources/android/back.png
===================================================================
(Binary files differ)
Property changes on: trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/resources/android/back.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/resources/android/forward-selected.png
===================================================================
(Binary files differ)
Property changes on: trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/resources/android/forward-selected.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/resources/android/forward.png
===================================================================
(Binary files differ)
Property changes on: trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/resources/android/forward.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/resources/android/home-selected.png
===================================================================
(Binary files differ)
Property changes on: trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/resources/android/home-selected.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/resources/android/home.png
===================================================================
(Binary files differ)
Property changes on: trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/resources/android/home.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/resources/android/nav-1.png
===================================================================
(Binary files differ)
Property changes on: trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/resources/android/nav-1.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/resources/android/nav-2.png
===================================================================
(Binary files differ)
Property changes on: trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/resources/android/nav-2.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/resources/android/nav-3.png
===================================================================
(Binary files differ)
Property changes on: trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/resources/android/nav-3.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/resources/android/refresh-selected.png
===================================================================
(Binary files differ)
Property changes on: trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/resources/android/refresh-selected.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/resources/android/refresh.png
===================================================================
(Binary files differ)
Property changes on: trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/resources/android/refresh.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/resources/android/stop-selected.png
===================================================================
(Binary files differ)
Property changes on: trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/resources/android/stop-selected.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/resources/android/stop.png
===================================================================
(Binary files differ)
Property changes on: trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/resources/android/stop.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/resources/android/time-1.png
===================================================================
(Binary files differ)
Property changes on: trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/resources/android/time-1.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/resources/android/time-2.png
===================================================================
(Binary files differ)
Property changes on: trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/resources/android/time-2.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/resources/android/time-3.png
===================================================================
(Binary files differ)
Property changes on: trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/resources/android/time-3.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Modified: trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/resources/config/devices.cfg
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/resources/config/devices.cfg 2012-04-13 16:32:33 UTC (rev 40184)
+++ trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/resources/config/devices.cfg 2012-04-13 18:24:03 UTC (rev 40185)
@@ -5,7 +5,7 @@
Apple iPad 2 768 1024 Mozilla/5.0 (iPad; U; CPU OS 4_3_1 like Mac OS X; en-us) AppleWebKit/533.17.9 (KHTML, like Gecko) Version/5.0.2 Mobile/8G4 Safari/6533.18.5 Apple iPhone 3
Apple iPhone 3 320 480 Mozilla/5.0 (iPhone; U; CPU iPhone OS 4_0 like Mac OS X; en-us) AppleWebKit/532.9 (KHTML, like Gecko) Version/4.0.5 Mobile/8A293 Safari/6531.22.7 Apple iPhone 3
Apple iPhone 4 640 960 Mozilla/5.0 (iPhone; U; CPU iPhone OS 4_0 like Mac OS X; en-us) AppleWebKit/532.9 (KHTML, like Gecko) Version/4.0.5 Mobile/8A293 Safari/6531.22.7 Apple iPhone 3
-RIM BlackBerry Bold Touch 9900 640 480 Mozilla/5.0 (BlackBerry; U; BlackBerry 9900; en-US) AppleWebKit/534.1+ (KHTML, like Gecko) Version/6.0.0.246 Mobile Safari/534.1+ Apple iPhone 3
-Samsung Galaxy S 480 800 Mozilla/5.0 (Linux; U; Android 2.3.3; en-us; GT-I9000 Build/GINGERBREAD) AppleWebKit/533.1 (KHTML, like Gecko) Version/4.0 Mobile Safari/533.1 Apple iPhone 3
-Samsung Galaxy S II 480 800 Mozilla/5.0 (Linux; U; Android 2.3; en-us; GT-I9100 Build/GRH78) AppleWebKit/533.1 (KHTML, like Gecko) Version/4.0 Mobile Safari/533.1 Apple iPhone 3
-Samsung Galaxy Tab 10.1 800 1280 Mozilla/5.0 (Linux; U; Android 3.0.1; en-us; GT-P7100 Build/HRI83) AppleWebKit/534.13 (KHTML, like Gecko) Version/4.0 MobileSafari/534.13 Apple iPhone 3
+RIM BlackBerry Bold Touch 9900 640 480 Mozilla/5.0 (BlackBerry; U; BlackBerry 9900; en-US) AppleWebKit/534.1+ (KHTML, like Gecko) Version/6.0.0.246 Mobile Safari/534.1+ Android
+Samsung Galaxy S 480 800 Mozilla/5.0 (Linux; U; Android 2.3.3; en-us; GT-I9000 Build/GINGERBREAD) AppleWebKit/533.1 (KHTML, like Gecko) Version/4.0 Mobile Safari/533.1 Android
+Samsung Galaxy S II 480 800 Mozilla/5.0 (Linux; U; Android 2.3; en-us; GT-I9100 Build/GRH78) AppleWebKit/533.1 (KHTML, like Gecko) Version/4.0 Mobile Safari/533.1 Android
+Samsung Galaxy Tab 10.1 800 1280 Mozilla/5.0 (Linux; U; Android 3.0.1; en-us; GT-P7100 Build/HRI83) AppleWebKit/534.13 (KHTML, like Gecko) Version/4.0 MobileSafari/534.13 Android
Added: trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/ui/skin/AbstractTimeComposite.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/ui/skin/AbstractTimeComposite.java (rev 0)
+++ trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/ui/skin/AbstractTimeComposite.java 2012-04-13 18:24:03 UTC (rev 40185)
@@ -0,0 +1,62 @@
+package org.jboss.tools.vpe.browsersim.ui.skin;
+
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Control;
+import org.eclipse.swt.widgets.Listener;
+
+public abstract class AbstractTimeComposite extends Composite {
+
+ /**
+ * Create the composite.
+ * @param parent
+ * @param style
+ */
+ public AbstractTimeComposite(Composite parent, ImageList imageList) {
+ super(parent, SWT.NONE);
+ GridLayout gridLayout = new GridLayout(5, false);
+ gridLayout.verticalSpacing = 0;
+ gridLayout.horizontalSpacing = 0;
+ gridLayout.marginWidth = 0;
+ gridLayout.marginHeight = 0;
+ setLayout(gridLayout);
+
+ for (ImageDescriptor descriptor : getBodyDescriptor()) {
+ descriptor.createWidget(this, imageList);
+ }
+ }
+
+ protected abstract ImageDescriptor[] getBodyDescriptor();
+
+ @Override
+ protected void checkSubclass() {
+ // Disable the check that prevents subclassing of SWT components
+ }
+
+ @Override
+ public void addListener(int eventType, Listener listener) {
+ super.addListener(eventType, listener);
+ switch (eventType) {
+ case SWT.MouseDown:
+ case SWT.MouseUp:
+ case SWT.MouseMove:
+ for (Control child : getChildren()) {
+ child.addListener(eventType, listener);
+ }
+ }
+ }
+
+ @Override
+ public void removeListener(int eventType, Listener listener) {
+ super.removeListener(eventType, listener);
+ switch (eventType) {
+ case SWT.MouseDown:
+ case SWT.MouseUp:
+ case SWT.MouseMove:
+ for (Control child : getChildren()) {
+ child.removeListener(eventType, listener);
+ }
+ }
+ }
+}
Added: trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/ui/skin/DeviceComposite.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/ui/skin/DeviceComposite.java (rev 0)
+++ trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/ui/skin/DeviceComposite.java 2012-04-13 18:24:03 UTC (rev 40185)
@@ -0,0 +1,44 @@
+package org.jboss.tools.vpe.browsersim.ui.skin;
+
+import org.eclipse.swt.custom.StyledText;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Listener;
+import org.eclipse.swt.widgets.Menu;
+import org.eclipse.swt.widgets.ProgressBar;
+import org.eclipse.swt.widgets.Text;
+
+public interface DeviceComposite {
+
+ public abstract ImageButtonComposite getBackButtonComposite();
+
+ public abstract ImageButtonComposite getForwardButtonComposite();
+
+ public abstract Composite getBrowserContainer();
+
+ public abstract void setNavBarCompositeVisible(boolean visible);
+
+ public abstract boolean isNavBarCompositeVisible();
+
+ public abstract ImageButtonComposite getStopButtonComposite();
+
+ public abstract ImageButtonComposite getRefreshButtonComposite();
+
+ public abstract Text getUrlText();
+
+ public abstract ProgressBar getProgressBar();
+
+ public abstract StyledText getPageTitleStyledText();
+
+ public abstract void addListener(int eventType, Listener listener);
+
+ public abstract void removeListener(int eventType, Listener listener);
+
+ public abstract void setMenu(Menu menu);
+
+ ImageButtonComposite getHomeButtonComposite();
+
+ public abstract Menu getMenu();
+
+ public abstract void dispose();
+
+}
Copied: trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/ui/skin/ImageButtonComposite.java (from rev 40140, trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/ui/skin/ios/ImageButtonComposite.java)
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/ui/skin/ImageButtonComposite.java (rev 0)
+++ trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/ui/skin/ImageButtonComposite.java 2012-04-13 18:24:03 UTC (rev 40185)
@@ -0,0 +1,95 @@
+package org.jboss.tools.vpe.browsersim.ui.skin;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.events.MouseEvent;
+import org.eclipse.swt.events.MouseTrackListener;
+import org.eclipse.swt.graphics.Image;
+import org.eclipse.swt.graphics.Rectangle;
+import org.eclipse.swt.layout.FormData;
+import org.eclipse.swt.widgets.Composite;
+import org.jboss.tools.vpe.browsersim.ui.skin.ios.ButtonDescriptor;
+
+
+public class ImageButtonComposite extends Composite {
+
+ private MouseTrackListener mouseTrackListener;
+ private Image enabledImage;
+ private Image disabledImage;
+ private Image selectedImage;
+ protected boolean enabled;
+
+ /**
+ * Create the composite.
+ * @param parent
+ * @param style
+ */
+ public ImageButtonComposite(Composite parent, Image enabledImage, Image disabledImage, Image selectedImage) {
+ super(parent, SWT.NONE);
+ this.enabledImage = enabledImage;
+ this.disabledImage = disabledImage;
+ this.selectedImage = selectedImage;
+ setEnabled(true);
+ addMouseTrackListener(getMouseTrackListener());
+ }
+
+ public ImageButtonComposite(Composite parent, ImageList imageList, ButtonDescriptor buttonDescriptor) {
+ this( parent, imageList.getImage(buttonDescriptor.getEnabledImageName()),
+ imageList.getImage(buttonDescriptor.getDisabledImageName()),
+ imageList.getImage(buttonDescriptor.getSelectedImageName()) );
+
+ FormData formData = buttonDescriptor.getFormData();
+ FormData actualFormData = new FormData();
+ actualFormData.left = formData.left;
+ actualFormData.top = formData.top;
+ actualFormData.right = formData.right;
+ actualFormData.bottom = formData.bottom;
+
+ Rectangle size = enabledImage.getBounds();
+ actualFormData.width = size.width;
+ actualFormData.height = size.height;
+
+ this.setLayoutData(actualFormData);
+ }
+
+ public void setEnabled(boolean enabled) {
+ this.enabled = enabled;
+ if (enabled) {
+ setBackgroundImage(enabledImage);
+ } else {
+ setBackgroundImage(disabledImage);
+ }
+ }
+
+ public boolean getEnabled() {
+ return enabled;
+ }
+
+ @Override
+ protected void checkSubclass() {
+ // Disable the check that prevents subclassing of SWT components
+ }
+
+ private MouseTrackListener getMouseTrackListener() {
+ if (mouseTrackListener == null) {
+ mouseTrackListener = new MouseTrackListener() {
+ @Override
+ public void mouseHover(MouseEvent e) {
+ }
+
+ @Override
+ public void mouseExit(MouseEvent e) {
+ if (enabled) {
+ setBackgroundImage(enabledImage);
+ }
+ }
+
+ @Override
+ public void mouseEnter(MouseEvent e) {
+ if (enabled) {
+ setBackgroundImage(selectedImage);
+ }
+ }
+ };
+ }
+ return mouseTrackListener;
+ }
+}
Copied: trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/ui/skin/ImageDescriptor.java (from rev 40140, trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/ui/skin/ios/ImageDescriptor.java)
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/ui/skin/ImageDescriptor.java (rev 0)
+++ trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/ui/skin/ImageDescriptor.java 2012-04-13 18:24:03 UTC (rev 40185)
@@ -0,0 +1,53 @@
+package org.jboss.tools.vpe.browsersim.ui.skin;
+
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.graphics.Image;
+import org.eclipse.swt.graphics.Rectangle;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.widgets.Composite;
+
+
+public class ImageDescriptor extends WidgetDescriptor {
+ protected String imageName;
+
+ public ImageDescriptor(String imageName, int horizontalSpan, int verticalSpan, int stretching) {
+ super(horizontalSpan, verticalSpan, stretching);
+ this.imageName = imageName;
+ }
+ public ImageDescriptor(String imageName, int horizontalSpan, int verticalSpan) {
+ this(imageName, horizontalSpan, verticalSpan, SWT.NONE);
+ }
+ public ImageDescriptor(String imageName) {
+ this(imageName, 1, 1);
+ }
+
+ public Composite createWidget(Composite parent, ImageList imageList) {
+ Composite composite = new Composite(parent, SWT.NONE);
+ boolean fillHorizontal = (getStretching() & SWT.HORIZONTAL) != 0;
+ boolean fillVertical = (getStretching() & SWT.VERTICAL) != 0;
+ GridData gridData = new GridData(
+ fillHorizontal ? SWT.FILL: SWT.CENTER,
+ fillVertical ? SWT.FILL: SWT.CENTER,
+ fillHorizontal, fillVertical,
+ getHorizontalSpan(), getVerticalSpan());
+
+ String imageName = getImageName();
+ if (imageName != null) {
+ Image image = imageList.getImage(imageName);
+ composite.setBackgroundImage(image);
+ Rectangle bounds = image.getBounds();
+ gridData.widthHint = fillHorizontal ? SWT.DEFAULT : bounds.width;
+ gridData.heightHint = fillVertical ? SWT.DEFAULT : bounds.height;
+ } else {
+ composite.setBackground(parent.getDisplay().getSystemColor(SWT.COLOR_WHITE));
+ }
+
+ composite.setLayoutData(gridData);
+
+ return composite;
+ }
+
+ public String getImageName() {
+ return imageName;
+ }
+}
Copied: trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/ui/skin/WidgetDescriptor.java (from rev 40140, trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/ui/skin/ios/WidgetDescriptor.java)
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/ui/skin/WidgetDescriptor.java (rev 0)
+++ trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/ui/skin/WidgetDescriptor.java 2012-04-13 18:24:03 UTC (rev 40185)
@@ -0,0 +1,31 @@
+package org.jboss.tools.vpe.browsersim.ui.skin;
+import org.eclipse.swt.SWT;
+
+public class WidgetDescriptor {
+ protected int horizontalSpan;
+ protected int verticalSpan;
+ protected int stretching;
+
+ public WidgetDescriptor(int horizontalSpan, int verticalSpan, int stretching) {
+ this.verticalSpan = verticalSpan;
+ this.horizontalSpan = horizontalSpan;
+ this.stretching = stretching;
+ }
+
+ public WidgetDescriptor(int horizontalSpan, int verticalSpan) {
+ this(horizontalSpan, verticalSpan, SWT.NONE);
+ }
+ public WidgetDescriptor() {
+ this(1, 1);
+ }
+
+ public int getHorizontalSpan() {
+ return horizontalSpan;
+ }
+ public int getVerticalSpan() {
+ return verticalSpan;
+ }
+ public int getStretching() {
+ return stretching;
+ }
+}
Added: trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/ui/skin/android/AndroidComposite.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/ui/skin/android/AndroidComposite.java (rev 0)
+++ trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/ui/skin/android/AndroidComposite.java 2012-04-13 18:24:03 UTC (rev 40185)
@@ -0,0 +1,256 @@
+package org.jboss.tools.vpe.browsersim.ui.skin.android;
+
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.custom.StyledText;
+import org.eclipse.swt.events.MouseAdapter;
+import org.eclipse.swt.events.MouseEvent;
+import org.eclipse.swt.layout.FormAttachment;
+import org.eclipse.swt.layout.FormData;
+import org.eclipse.swt.layout.FormLayout;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Control;
+import org.eclipse.swt.widgets.Listener;
+import org.eclipse.swt.widgets.Menu;
+import org.eclipse.swt.widgets.ProgressBar;
+import org.eclipse.swt.widgets.Text;
+import org.jboss.tools.vpe.browsersim.ui.skin.ImageButtonComposite;
+import org.jboss.tools.vpe.browsersim.ui.skin.ImageDescriptor;
+import org.jboss.tools.vpe.browsersim.ui.skin.ImageList;
+import org.jboss.tools.vpe.browsersim.ui.skin.DeviceComposite;
+
+public class AndroidComposite extends Composite implements DeviceComposite {
+ private ImageList imageList;
+ private Composite androidOsCompositeContainer;
+
+// ImageDescriptor I_OS_DESCRIPTOR = new ImageDescriptor(null, 5, 3, SWT.VERTICAL | SWT.HORIZONTAL);
+// ImageDescriptor[] BODY_DESCRIPTOR = {
+// new ImageDescriptor("01.png"), new ImageDescriptor("02.png"), new ImageDescriptor("03.png", 1, 1, SWT.HORIZONTAL), new ImageDescriptor("04.png"), new ImageDescriptor("05.png", 1, 1, SWT.HORIZONTAL), new ImageDescriptor("06.png"), new ImageDescriptor("07.png"),
+// new ImageDescriptor("08.png"), I_OS_DESCRIPTOR, new ImageDescriptor("14.png"),
+// new ImageDescriptor("21.png", 1, 1, SWT.VERTICAL), new ImageDescriptor("22.png", 1, 1, SWT.VERTICAL),
+// new ImageDescriptor("23.png"), new ImageDescriptor("24.png"),
+// new ImageDescriptor("25.png"), new ImageDescriptor("26.png"), new ImageDescriptor("27.png", 1, 1, SWT.HORIZONTAL), new ImageDescriptor("28.png"), new ImageDescriptor("29.png", 1, 1, SWT.HORIZONTAL), new ImageDescriptor("30.png"), new ImageDescriptor("31.png"),
+// };
+
+ private Composite browserContainer;
+ private AndroidNavBarComposite navBarComposite;
+ private ImageButtonComposite forwardButtonComposite;
+ private ImageButtonComposite backButtonComposite;
+ private ImageButtonComposite homeButtonComposite;
+ private ImageButtonComposite refreshButtonComposite;
+
+ private Composite bodyComposite;
+
+ /**
+ * Create the composite.
+ * @param parent
+ * @param skinDescriptor
+ * @param style
+ */
+ public AndroidComposite(Composite parent, AndroidSkinDescriptor skinDescriptor) {
+ super(parent, SWT.NONE);
+
+ imageList = new ImageList(this);
+ setLayout(new FormLayout());
+
+ backButtonComposite = new ImageButtonComposite(this, imageList, skinDescriptor.getBackButton());
+ forwardButtonComposite = new ImageButtonComposite(this, imageList, skinDescriptor.getForwardButton());
+ refreshButtonComposite = new ImageButtonComposite(this, imageList, skinDescriptor.getRefreshButton());
+ homeButtonComposite = new ImageButtonComposite(this, imageList, skinDescriptor.getHomeButton());
+
+ bodyComposite = new Composite(this, SWT.NONE);
+ FormData formData = new FormData();
+ formData.left = new FormAttachment(0);
+ formData.top = new FormAttachment(0);
+ formData.right = new FormAttachment(100);
+ formData.bottom = new FormAttachment(100);
+ bodyComposite.setLayoutData(formData);
+
+ GridLayout gridLayout = new GridLayout(skinDescriptor.getBodyGridSize(), false);
+ gridLayout.verticalSpacing = 0;
+ gridLayout.horizontalSpacing = 0;
+ gridLayout.marginWidth = 0;
+ gridLayout.marginHeight = 0;
+ bodyComposite.setLayout(gridLayout);
+
+ for (ImageDescriptor descriptor : skinDescriptor.getBodyGridImageDescriptors()) {
+ Composite composite = descriptor.createWidget(bodyComposite, imageList);
+ if (descriptor == skinDescriptor.getAndroidOSDescriptor()) {
+ androidOsCompositeContainer = composite;
+ }
+ }
+
+ gridLayout = new GridLayout(1, false);
+ gridLayout.verticalSpacing = 0;
+ gridLayout.horizontalSpacing = 0;
+ gridLayout.marginWidth = 0;
+ gridLayout.marginHeight = 0;
+ androidOsCompositeContainer.setLayout(gridLayout);
+ AndroidTimeComposite timeComposite = new AndroidTimeComposite(androidOsCompositeContainer, imageList);
+ GridData gridData = new GridData(SWT.FILL, SWT.BEGINNING, true, false, 1, 1);
+ timeComposite.setLayoutData(gridData);
+
+ navBarComposite = new AndroidNavBarComposite(androidOsCompositeContainer, imageList);
+ gridData = new GridData(SWT.FILL, SWT.BEGINNING, true, false, 1, 1);
+ navBarComposite.setLayoutData(gridData);
+
+ browserContainer = new Composite(androidOsCompositeContainer, SWT.NONE);
+ gridData = new GridData(SWT.FILL, SWT.FILL, true, true, 1, 1);
+ browserContainer.setLayoutData(gridData);
+
+ timeComposite.addMouseListener(new MouseAdapter() {
+ public void mouseDown(MouseEvent e) {
+ if (e.button == 1) {
+ setNavBarCompositeVisible(!isNavBarCompositeVisible());
+ }
+ }
+ });
+ }
+
+ /* (non-Javadoc)
+ * @see org.jboss.tools.vpe.browsersim.ui.skin.ios.PhoneComposite#getBackButtonComposite()
+ */
+ @Override
+ public ImageButtonComposite getBackButtonComposite() {
+ return backButtonComposite;
+ }
+
+ /* (non-Javadoc)
+ * @see org.jboss.tools.vpe.browsersim.ui.skin.ios.PhoneComposite#getForwardButtonComposite()
+ */
+ @Override
+ public ImageButtonComposite getForwardButtonComposite() {
+ return forwardButtonComposite;
+ }
+
+ /* (non-Javadoc)
+ * @see org.jboss.tools.vpe.browsersim.ui.skin.ios.PhoneComposite#getBrowserContainer()
+ */
+ @Override
+ public Composite getBrowserContainer() {
+ return browserContainer;
+ }
+
+ @Override
+ protected void checkSubclass() {
+ // Disable the check that prevents subclassing of SWT components
+ }
+
+ /* (non-Javadoc)
+ * @see org.jboss.tools.vpe.browsersim.ui.skin.ios.PhoneComposite#setNavBarCompositeVisible(boolean)
+ */
+ @Override
+ public void setNavBarCompositeVisible(boolean visible) {
+ GridData gridData = (GridData) navBarComposite.getLayoutData();
+ if (visible) {
+ gridData.heightHint = SWT.DEFAULT;
+ } else {
+ gridData.heightHint = 0;
+ }
+ androidOsCompositeContainer.layout();
+ }
+
+ /* (non-Javadoc)
+ * @see org.jboss.tools.vpe.browsersim.ui.skin.ios.PhoneComposite#isNavBarCompositeVisible()
+ */
+ @Override
+ public boolean isNavBarCompositeVisible() {
+ GridData gridData = (GridData) navBarComposite.getLayoutData();
+ return gridData.heightHint != 0;
+ }
+
+ /* (non-Javadoc)
+ * @see org.jboss.tools.vpe.browsersim.ui.skin.ios.PhoneComposite#getStopButtonComposite()
+ */
+ @Override
+ public ImageButtonComposite getStopButtonComposite() {
+ return navBarComposite.getStopButtonComposite();
+ }
+
+ /* (non-Javadoc)
+ * @see org.jboss.tools.vpe.browsersim.ui.skin.ios.PhoneComposite#getRefreshButtonComposite()
+ */
+ @Override
+ public ImageButtonComposite getRefreshButtonComposite() {
+ return refreshButtonComposite;
+ }
+
+ /* (non-Javadoc)
+ * @see org.jboss.tools.vpe.browsersim.ui.skin.ios.PhoneComposite#getRefreshButtonComposite()
+ */
+ @Override
+ public ImageButtonComposite getHomeButtonComposite() {
+ return homeButtonComposite;
+ }
+
+ /* (non-Javadoc)
+ * @see org.jboss.tools.vpe.browsersim.ui.skin.ios.PhoneComposite#getUrlText()
+ */
+ @Override
+ public Text getUrlText() {
+ return navBarComposite.getUrlText();
+ }
+
+ /* (non-Javadoc)
+ * @see org.jboss.tools.vpe.browsersim.ui.skin.ios.PhoneComposite#getProgressBar()
+ */
+ @Override
+ public ProgressBar getProgressBar() {
+ return navBarComposite.getProgressBar();
+ }
+
+ /* (non-Javadoc)
+ * @see org.jboss.tools.vpe.browsersim.ui.skin.ios.PhoneComposite#getPageTitleStyledText()
+ */
+ @Override
+ public StyledText getPageTitleStyledText() {
+ return null;
+ }
+
+ /* (non-Javadoc)
+ * @see org.jboss.tools.vpe.browsersim.ui.skin.ios.PhoneComposite#addListener(int, org.eclipse.swt.widgets.Listener)
+ */
+ @Override
+ public void addListener(int eventType, Listener listener) {
+ super.addListener(eventType, listener);
+ switch (eventType) {
+ case SWT.MouseDown:
+ case SWT.MouseUp:
+ case SWT.MouseMove:
+ bodyComposite.addListener(eventType, listener);
+ for (Control child : bodyComposite.getChildren()) {
+ child.addListener(eventType, listener);
+ }
+ }
+ }
+
+ /* (non-Javadoc)
+ * @see org.jboss.tools.vpe.browsersim.ui.skin.ios.PhoneComposite#removeListener(int, org.eclipse.swt.widgets.Listener)
+ */
+ @Override
+ public void removeListener(int eventType, Listener listener) {
+ super.removeListener(eventType, listener);
+ switch (eventType) {
+ case SWT.MouseDown:
+ case SWT.MouseUp:
+ case SWT.MouseMove:
+ bodyComposite.removeListener(eventType, listener);
+ for (Control child :bodyComposite.getChildren()) {
+ child.removeListener(eventType, listener);
+ }
+ }
+ }
+
+ /* (non-Javadoc)
+ * @see org.jboss.tools.vpe.browsersim.ui.skin.ios.PhoneComposite#setMenu(org.eclipse.swt.widgets.Menu)
+ */
+ @Override
+ public void setMenu(Menu menu) {
+ super.setMenu(menu);
+ bodyComposite.setMenu(menu);
+ for (Control child :bodyComposite.getChildren()) {
+ child.setMenu(menu);
+ }
+ }
+}
Added: trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/ui/skin/android/AndroidNavBarComposite.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/ui/skin/android/AndroidNavBarComposite.java (rev 0)
+++ trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/ui/skin/android/AndroidNavBarComposite.java 2012-04-13 18:24:03 UTC (rev 40185)
@@ -0,0 +1,99 @@
+package org.jboss.tools.vpe.browsersim.ui.skin.android;
+
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.graphics.Rectangle;
+import org.eclipse.swt.layout.FormAttachment;
+import org.eclipse.swt.layout.FormData;
+import org.eclipse.swt.layout.FormLayout;
+import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.ProgressBar;
+import org.eclipse.swt.widgets.Text;
+import org.jboss.tools.vpe.browsersim.ui.skin.ImageButtonComposite;
+import org.jboss.tools.vpe.browsersim.ui.skin.ImageDescriptor;
+import org.jboss.tools.vpe.browsersim.ui.skin.ImageList;
+
+public class AndroidNavBarComposite extends Composite {
+ private final String BD = "android/";
+ private final ImageDescriptor[] BODY_DESCRIPTOR = {
+ new ImageDescriptor(BD + "nav-1.png"), new ImageDescriptor(BD + "nav-2.png", 1, 1, SWT.HORIZONTAL), new ImageDescriptor(BD + "nav-3.png")
+ };
+ private ImageButtonComposite stopButtonComposite;
+ private Text urlText;
+ private ProgressBar progressBar;
+
+ /**
+ * Create the composite.
+ * @param parent
+ * @param style
+ */
+ public AndroidNavBarComposite(Composite parent, ImageList imageList) {
+ super(parent, SWT.NONE);
+
+ this.setLayout(new FormLayout());
+
+ urlText = new Text(this, SWT.SINGLE);
+
+ FormData formData = new FormData();
+ formData.left = new FormAttachment(0, 17);
+ formData.right = new FormAttachment(100, -55);
+ formData.top = new FormAttachment(0, 22);
+ formData.bottom = new FormAttachment(100, -20);
+ urlText.setLayoutData(formData);
+
+ stopButtonComposite = new ImageButtonComposite(this, imageList.getImage(BD + "stop.png"), imageList.getImage(BD + "stop.png"), imageList.getImage(BD + "stop-selected.png"));
+ formData = new FormData();
+ Rectangle stopImageBounds = imageList.getImage(BD + "stop.png").getBounds();
+ formData.right = new FormAttachment(100, -12);
+ formData.bottom = new FormAttachment(100, -11);
+ formData.width = stopImageBounds.width;
+ formData.height = stopImageBounds.height;
+ stopButtonComposite.setLayoutData(formData);
+
+ progressBar = new ProgressBar(this, SWT.NONE);
+ progressBar.setVisible(false);
+ formData = new FormData();
+ formData.left = new FormAttachment(0, 10);
+ formData.right = new FormAttachment(100, -10);
+ formData.top = new FormAttachment(0, 2);
+ formData.height = 5;
+ progressBar.setLayoutData(formData);
+
+ Composite imagesComposite = new Composite(this, SWT.NONE);
+ formData = new FormData();
+ formData.left = new FormAttachment(0);
+ formData.right = new FormAttachment(100);
+ formData.top = new FormAttachment(0);
+ formData.bottom = new FormAttachment(100);
+ imagesComposite.setLayoutData(formData);
+
+ GridLayout gridLayout = new GridLayout(5, false);
+ gridLayout.verticalSpacing = 0;
+ gridLayout.horizontalSpacing = 0;
+ gridLayout.marginWidth = 0;
+ gridLayout.marginHeight = 0;
+
+ imagesComposite.setLayout(gridLayout);
+
+ for (ImageDescriptor descriptor : BODY_DESCRIPTOR) {
+ descriptor.createWidget(imagesComposite, imageList);
+ }
+ }
+
+ @Override
+ protected void checkSubclass() {
+ // Disable the check that prevents subclassing of SWT components
+ }
+
+ public ImageButtonComposite getStopButtonComposite() {
+ return stopButtonComposite;
+ }
+
+ public Text getUrlText() {
+ return urlText;
+ }
+
+ public ProgressBar getProgressBar() {
+ return progressBar;
+ }
+}
Modified: trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/ui/skin/android/AndroidResizableSkin.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/ui/skin/android/AndroidResizableSkin.java 2012-04-13 16:32:33 UTC (rev 40184)
+++ trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/ui/skin/android/AndroidResizableSkin.java 2012-04-13 18:24:03 UTC (rev 40185)
@@ -4,10 +4,12 @@
import org.eclipse.swt.graphics.Point;
import org.eclipse.swt.layout.FormAttachment;
import org.eclipse.swt.layout.FormData;
+import org.eclipse.swt.widgets.Composite;
+import org.jboss.tools.vpe.browsersim.ui.skin.DeviceComposite;
+import org.jboss.tools.vpe.browsersim.ui.skin.ImageDescriptor;
import org.jboss.tools.vpe.browsersim.ui.skin.ios.AppleIPhone3ResizableSkin;
import org.jboss.tools.vpe.browsersim.ui.skin.ios.ButtonDescriptor;
import org.jboss.tools.vpe.browsersim.ui.skin.ios.IPhoneSkinDescriptor;
-import org.jboss.tools.vpe.browsersim.ui.skin.ios.ImageDescriptor;
public class AndroidResizableSkin extends AppleIPhone3ResizableSkin {
private static final Point NORMAL_SKREEN_SIZE = new Point(240, 1);
@@ -22,7 +24,7 @@
1, 23, 1};
private static final Point VERTICAL_BORDERS_SIZE = new Point(NORMAL_SKIN_SIZE.x - NORMAL_SKREEN_SIZE.x, NORMAL_SKIN_SIZE.y - NORMAL_SKREEN_SIZE.y);
private static final Point HORIZONTAL_BORDERS_SIZE = new Point(VERTICAL_BORDERS_SIZE.y, VERTICAL_BORDERS_SIZE.x);
- private static final IPhoneSkinDescriptor VERTICAL_DESCRIPTOR;
+ private static final AndroidSkinDescriptor VERTICAL_DESCRIPTOR;
static {
String bd = "android/droid/vertical/";
ImageDescriptor iOsDescriptor = new ImageDescriptor(null, 3, 1, SWT.VERTICAL | SWT.HORIZONTAL);
@@ -33,23 +35,38 @@
};
int bodyGridSize = 5;
- String bd2 = "ios/";
+ String bd2 = "android/";
ButtonDescriptor backButtonDescriptor;
{
FormData formData = new FormData();
- formData.left = new FormAttachment(0, 52);
- formData.bottom = new FormAttachment(100, -132);
- backButtonDescriptor = new ButtonDescriptor(formData, bd2 + "back.png", bd2 + "back-disabled.png", bd2 + "back-selected.png");
+ formData.left = new FormAttachment(0, 61);
+ formData.bottom = new FormAttachment(100, -41);
+ backButtonDescriptor = new ButtonDescriptor(formData, bd2 + "back.png", bd2 + "back.png", bd2 + "back-selected.png");//XXX
}
ButtonDescriptor forwardButtonDescriptor;
{
FormData formData = new FormData();
- formData.left = new FormAttachment(0, 115);
- formData.bottom = new FormAttachment(100, -132);
- forwardButtonDescriptor = new ButtonDescriptor(formData, bd2 + "forward.png", bd2 + "forward-disabled.png", bd2 + "forward-selected.png");
+ formData.left = new FormAttachment(33, 12);
+ formData.bottom = new FormAttachment(100, -41);
+ forwardButtonDescriptor = new ButtonDescriptor(formData, bd2 + "forward.png", bd2 + "forward.png", bd2 + "forward-selected.png");//XXX
}
- VERTICAL_DESCRIPTOR = new IPhoneSkinDescriptor(bodyGridSize, bodyGridImageDescriptors, iOsDescriptor, backButtonDescriptor, forwardButtonDescriptor);
+ ButtonDescriptor homeButtonDescriptor;
+ {
+ FormData formData = new FormData();
+ formData.left = new FormAttachment(67, -45);
+ formData.bottom = new FormAttachment(100, -41);
+ homeButtonDescriptor = new ButtonDescriptor(formData, bd2 + "home.png", bd2 + "home.png", bd2 + "home-selected.png");//XXX
+ }
+ ButtonDescriptor refreshButtonDescriptor;
+ {
+ FormData formData = new FormData();
+ formData.left = new FormAttachment(100, -61 - 28);
+ formData.bottom = new FormAttachment(100, -41);
+ refreshButtonDescriptor = new ButtonDescriptor(formData, bd2 + "refresh.png", bd2 + "refresh.png", bd2 + "refresh-selected.png");//XXX
+ }
+ VERTICAL_DESCRIPTOR = new AndroidSkinDescriptor(bodyGridSize, bodyGridImageDescriptors, iOsDescriptor,
+ backButtonDescriptor, forwardButtonDescriptor, homeButtonDescriptor, refreshButtonDescriptor);
}
private static final IPhoneSkinDescriptor HORIZONTAL_IPHONE3_DESCRIPTOR;
static {
@@ -91,14 +108,14 @@
}
@Override
- protected IPhoneSkinDescriptor getSkinDescriptor(boolean vertical) {
- IPhoneSkinDescriptor skinDescriptor;
+ protected DeviceComposite createDeviceComposite(Composite parent, boolean vertical) {
+ AndroidSkinDescriptor skinDescriptor;
if (vertical) {
skinDescriptor = VERTICAL_DESCRIPTOR;
} else {
skinDescriptor = VERTICAL_DESCRIPTOR;
}
- return skinDescriptor;
+ return new AndroidComposite(parent, skinDescriptor);
}
@Override
Added: trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/ui/skin/android/AndroidSkinDescriptor.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/ui/skin/android/AndroidSkinDescriptor.java (rev 0)
+++ trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/ui/skin/android/AndroidSkinDescriptor.java 2012-04-13 18:24:03 UTC (rev 40185)
@@ -0,0 +1,55 @@
+package org.jboss.tools.vpe.browsersim.ui.skin.android;
+
+import org.jboss.tools.vpe.browsersim.ui.skin.ImageDescriptor;
+import org.jboss.tools.vpe.browsersim.ui.skin.ios.ButtonDescriptor;
+
+public class AndroidSkinDescriptor {
+ private int bodyGridSize;
+ private ImageDescriptor[] bodyGridImageDescriptors;
+ private ImageDescriptor iOSDescriptor;
+ private ButtonDescriptor backButton;
+ private ButtonDescriptor forwardButton;
+ private ButtonDescriptor homeButton;
+ private ButtonDescriptor refreshButton;
+
+ public AndroidSkinDescriptor(int bodyGridSize,
+ ImageDescriptor[] bodyGridImageDescriptors,
+ ImageDescriptor iOSDescriptor, ButtonDescriptor backButton,
+ ButtonDescriptor forwardButton, ButtonDescriptor homeButton,
+ ButtonDescriptor refreshButton) {
+ this.bodyGridSize = bodyGridSize;
+ this.bodyGridImageDescriptors = bodyGridImageDescriptors;
+ this.iOSDescriptor = iOSDescriptor;
+ this.backButton = backButton;
+ this.forwardButton = forwardButton;
+ this.homeButton = homeButton;
+ this.refreshButton = refreshButton;
+ }
+
+ public int getBodyGridSize() {
+ return bodyGridSize;
+ }
+
+ public ImageDescriptor[] getBodyGridImageDescriptors() {
+ return bodyGridImageDescriptors;
+ }
+
+ public ImageDescriptor getAndroidOSDescriptor() {
+ return iOSDescriptor;
+ }
+
+ public ButtonDescriptor getBackButton() {
+ return backButton;
+ }
+
+ public ButtonDescriptor getForwardButton() {
+ return forwardButton;
+ }
+ public ButtonDescriptor getHomeButton() {
+ return homeButton;
+ }
+
+ public ButtonDescriptor getRefreshButton() {
+ return refreshButton;
+ }
+}
Added: trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/ui/skin/android/AndroidTimeComposite.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/ui/skin/android/AndroidTimeComposite.java (rev 0)
+++ trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/ui/skin/android/AndroidTimeComposite.java 2012-04-13 18:24:03 UTC (rev 40185)
@@ -0,0 +1,22 @@
+package org.jboss.tools.vpe.browsersim.ui.skin.android;
+
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.widgets.Composite;
+import org.jboss.tools.vpe.browsersim.ui.skin.AbstractTimeComposite;
+import org.jboss.tools.vpe.browsersim.ui.skin.ImageDescriptor;
+import org.jboss.tools.vpe.browsersim.ui.skin.ImageList;
+
+public class AndroidTimeComposite extends AbstractTimeComposite {
+ private static final String BD = "android/";
+ private static final ImageDescriptor[] BODY_DESCRIPTOR = {
+ new ImageDescriptor(BD + "time-1.png"), new ImageDescriptor(BD + "time-2.png", 1, 1, SWT.HORIZONTAL), new ImageDescriptor(BD + "time-3.png")
+ };
+
+ public AndroidTimeComposite(Composite parent, ImageList imageList) {
+ super(parent, imageList);
+ }
+
+ protected ImageDescriptor[] getBodyDescriptor() {
+ return BODY_DESCRIPTOR;
+ }
+}
Modified: trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/ui/skin/ios/AppleIPhone3ResizableSkin.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/ui/skin/ios/AppleIPhone3ResizableSkin.java 2012-04-13 16:32:33 UTC (rev 40184)
+++ trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/ui/skin/ios/AppleIPhone3ResizableSkin.java 2012-04-13 18:24:03 UTC (rev 40185)
@@ -24,6 +24,8 @@
import org.jboss.tools.vpe.browsersim.ui.ControlHandler;
import org.jboss.tools.vpe.browsersim.ui.skin.AppleIPhone3Skin;
import org.jboss.tools.vpe.browsersim.ui.skin.BrowserSimSkin;
+import org.jboss.tools.vpe.browsersim.ui.skin.DeviceComposite;
+import org.jboss.tools.vpe.browsersim.ui.skin.ImageDescriptor;
public class AppleIPhone3ResizableSkin implements BrowserSimSkin {
private static final Point NORMAL_SKREEN_SIZE = new Point(320, 480);
@@ -100,7 +102,7 @@
private Shell shell;
private BrowserSimBrowser browser;
private ControlHandler controlHandler;
- private AppleIPhoneComposite iPhoneComposite;
+ private DeviceComposite deviceComposite;
@Override
public void setBrowserFactory(IBrowserSimBrowserFactory browserFactory) {
@@ -113,10 +115,10 @@
shell = new Shell(display, SWT.NO_TRIM | SWT.NO_BACKGROUND);
shell.setLayout(new FillLayout());
- iPhoneComposite = new AppleIPhoneComposite(shell, VERTICAL_IPHONE3_DESCRIPTOR);
+ deviceComposite = new AppleIPhoneComposite(shell, VERTICAL_IPHONE3_DESCRIPTOR);
vertical = true;
bindIPhoneCompositeControls();
- Composite browserContainer = iPhoneComposite.getBrowserContainer();
+ Composite browserContainer = deviceComposite.getBrowserContainer();
browserContainer.setLayout(new FillLayout());
browser = browserFactory.createBrowser(browserContainer, SWT.NONE);
@@ -185,35 +187,35 @@
}
private void bindIPhoneCompositeControls() {
- iPhoneComposite.getBackButtonComposite().addMouseListener(new MouseAdapter() {
+ deviceComposite.getBackButtonComposite().addMouseListener(new MouseAdapter() {
public void mouseDown(MouseEvent e) {
if (e.button == 1) {
controlHandler.goBack();
}
}
});
- iPhoneComposite.getForwardButtonComposite().addMouseListener(new MouseAdapter() {
+ deviceComposite.getForwardButtonComposite().addMouseListener(new MouseAdapter() {
public void mouseDown(MouseEvent e) {
if (e.button == 1) {
controlHandler.goForward();
}
}
});
- iPhoneComposite.getStopButtonComposite().addMouseListener(new MouseAdapter() {
+ deviceComposite.getStopButtonComposite().addMouseListener(new MouseAdapter() {
public void mouseDown(MouseEvent e) {
if (e.button == 1) {
controlHandler.stop();
}
}
});
- iPhoneComposite.getRefreshButtonComposite().addMouseListener(new MouseAdapter() {
+ deviceComposite.getRefreshButtonComposite().addMouseListener(new MouseAdapter() {
public void mouseDown(MouseEvent e) {
if (e.button == 1) {
controlHandler.refresh();
}
}
});
- iPhoneComposite.getUrlText().addListener(SWT.DefaultSelection, new Listener() {
+ deviceComposite.getUrlText().addListener(SWT.DefaultSelection, new Listener() {
public void handleEvent(Event e) {
controlHandler.goToAddress(((Text)e.widget).getText());
}
@@ -244,9 +246,9 @@
}
}
};
- iPhoneComposite.addListener(SWT.MouseDown, l);
- iPhoneComposite.addListener(SWT.MouseUp, l);
- iPhoneComposite.addListener(SWT.MouseMove, l);
+ deviceComposite.addListener(SWT.MouseDown, l);
+ deviceComposite.addListener(SWT.MouseUp, l);
+ deviceComposite.addListener(SWT.MouseMove, l);
}
@Override
@@ -272,20 +274,22 @@
@Override
public void locationChanged(String newLocation, boolean backEnabled,
boolean forwardEnabled) {
- iPhoneComposite.getUrlText().setText(newLocation);
- iPhoneComposite.getBackButtonComposite().setEnabled(backEnabled);
- iPhoneComposite.getForwardButtonComposite().setEnabled(forwardEnabled);
+ deviceComposite.getUrlText().setText(newLocation);
+ deviceComposite.getBackButtonComposite().setEnabled(backEnabled);
+ deviceComposite.getForwardButtonComposite().setEnabled(forwardEnabled);
}
@Override
public void pageTitleChanged(String newTitle) {
- iPhoneComposite.getPageTitleStyledText().setText(newTitle);
+ if (deviceComposite.getPageTitleStyledText() != null) {
+ deviceComposite.getPageTitleStyledText().setText(newTitle);
+ }
}
@Override
public void progressChanged(int percents) {
- ProgressBar progressBar = iPhoneComposite.getProgressBar();
+ ProgressBar progressBar = deviceComposite.getProgressBar();
if (percents > 0) {
progressBar.setVisible(true);
progressBar.setSelection(percents);
@@ -303,22 +307,21 @@
@Override
public void setOrientationAndSize(Point maximumShellSize, int orientation, Point browserSize) {
vertical = (orientation == DeviceOrientation.PORTRAIT || orientation == DeviceOrientation.PORTRAIT_INVERTED);
- String urlTextText = iPhoneComposite.getUrlText().getText();
- String pageTitle = iPhoneComposite.getPageTitleStyledText().getText();
- boolean backEnabled = iPhoneComposite.getBackButtonComposite().getEnabled();
- boolean forwardEnabled = iPhoneComposite.getForwardButtonComposite().getEnabled();
- boolean navBarVisible = iPhoneComposite.isNavBarCompositeVisible();
- Menu contextMenu = iPhoneComposite.getMenu();
- iPhoneComposite.setMenu(null);
+ String urlTextText = deviceComposite.getUrlText().getText();
+ String pageTitle = deviceComposite.getPageTitleStyledText() != null ? deviceComposite.getPageTitleStyledText().getText() : "";
+ boolean backEnabled = deviceComposite.getBackButtonComposite().getEnabled();
+ boolean forwardEnabled = deviceComposite.getForwardButtonComposite().getEnabled();
+ boolean navBarVisible = deviceComposite.isNavBarCompositeVisible();
+ Menu contextMenu = deviceComposite.getMenu();
+ deviceComposite.setMenu(null);
- AppleIPhoneComposite oldIPhoneComposite = iPhoneComposite;
- IPhoneSkinDescriptor skinDescriptor = getSkinDescriptor(vertical);
- iPhoneComposite = new AppleIPhoneComposite(shell, skinDescriptor);
+ DeviceComposite oldDeviceComposite = deviceComposite;
+ deviceComposite = createDeviceComposite(shell, vertical);
bindIPhoneCompositeControls();
- Composite browserContainer = iPhoneComposite.getBrowserContainer();
+ Composite browserContainer = deviceComposite.getBrowserContainer();
browserContainer.setLayout(new FillLayout());
browser.setParent(browserContainer);
- oldIPhoneComposite.dispose();
+ oldDeviceComposite.dispose();
Point bordersSize = getBordersSize(vertical);
int shellWidth;
if (browserSize.x == SWT.DEFAULT) {
@@ -337,12 +340,14 @@
shell.layout(true);
setShellRegion();
- iPhoneComposite.getUrlText().setText(urlTextText);
- iPhoneComposite.getPageTitleStyledText().setText(pageTitle);
- iPhoneComposite.getBackButtonComposite().setEnabled(backEnabled);
- iPhoneComposite.getForwardButtonComposite().setEnabled(forwardEnabled);
- iPhoneComposite.setNavBarCompositeVisible(navBarVisible);
- iPhoneComposite.setMenu(contextMenu);
+ deviceComposite.getUrlText().setText(urlTextText);
+ if (deviceComposite.getPageTitleStyledText() != null) {
+ deviceComposite.getPageTitleStyledText().setText(pageTitle);
+ }
+ deviceComposite.getBackButtonComposite().setEnabled(backEnabled);
+ deviceComposite.getForwardButtonComposite().setEnabled(forwardEnabled);
+ deviceComposite.setNavBarCompositeVisible(navBarVisible);
+ deviceComposite.setMenu(contextMenu);
}
protected Point getBordersSize(boolean vertical) {
@@ -350,14 +355,15 @@
return bordersSize;
}
- protected IPhoneSkinDescriptor getSkinDescriptor(boolean vertical) {
+ protected DeviceComposite createDeviceComposite(Composite parent, boolean vertical) {
IPhoneSkinDescriptor skinDescriptor;
if (vertical) {
skinDescriptor = VERTICAL_IPHONE3_DESCRIPTOR;
} else {
skinDescriptor = HORIZONTAL_IPHONE3_DESCRIPTOR;
}
- return skinDescriptor;
+
+ return new AppleIPhoneComposite(parent, skinDescriptor);
}
protected int[] getNormalRegion(boolean vertical) {
@@ -372,11 +378,11 @@
@Override
public void setAddressBarVisible(boolean visible) {
- iPhoneComposite.setNavBarCompositeVisible(visible);
+ deviceComposite.setNavBarCompositeVisible(visible);
}
@Override
public void setContextMenu(Menu contextMenu) {
- iPhoneComposite.setMenu(contextMenu);
+ deviceComposite.setMenu(contextMenu);
}
}
Modified: trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/ui/skin/ios/AppleIPhoneComposite.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/ui/skin/ios/AppleIPhoneComposite.java 2012-04-13 16:32:33 UTC (rev 40184)
+++ trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/ui/skin/ios/AppleIPhoneComposite.java 2012-04-13 18:24:03 UTC (rev 40185)
@@ -14,10 +14,13 @@
import org.eclipse.swt.widgets.Menu;
import org.eclipse.swt.widgets.ProgressBar;
import org.eclipse.swt.widgets.Text;
+import org.jboss.tools.vpe.browsersim.ui.skin.ImageButtonComposite;
+import org.jboss.tools.vpe.browsersim.ui.skin.ImageDescriptor;
import org.jboss.tools.vpe.browsersim.ui.skin.ImageList;
+import org.jboss.tools.vpe.browsersim.ui.skin.DeviceComposite;
-public class AppleIPhoneComposite extends Composite {
+public class AppleIPhoneComposite extends Composite implements DeviceComposite {
private ImageList imageList;
private Composite iOsCompositeContainer;
@@ -101,14 +104,26 @@
});
}
+ /* (non-Javadoc)
+ * @see org.jboss.tools.vpe.browsersim.ui.skin.ios.PhoneComposite#getBackButtonComposite()
+ */
+ @Override
public ImageButtonComposite getBackButtonComposite() {
return backButtonComposite;
}
+ /* (non-Javadoc)
+ * @see org.jboss.tools.vpe.browsersim.ui.skin.ios.PhoneComposite#getForwardButtonComposite()
+ */
+ @Override
public ImageButtonComposite getForwardButtonComposite() {
return forwardButtonComposite;
}
+ /* (non-Javadoc)
+ * @see org.jboss.tools.vpe.browsersim.ui.skin.ios.PhoneComposite#getBrowserContainer()
+ */
+ @Override
public Composite getBrowserContainer() {
return browserContainer;
}
@@ -118,6 +133,10 @@
// Disable the check that prevents subclassing of SWT components
}
+ /* (non-Javadoc)
+ * @see org.jboss.tools.vpe.browsersim.ui.skin.ios.PhoneComposite#setNavBarCompositeVisible(boolean)
+ */
+ @Override
public void setNavBarCompositeVisible(boolean visible) {
GridData gridData = (GridData) navBarComposite.getLayoutData();
if (visible) {
@@ -128,31 +147,58 @@
iOsCompositeContainer.layout();
}
+ /* (non-Javadoc)
+ * @see org.jboss.tools.vpe.browsersim.ui.skin.ios.PhoneComposite#isNavBarCompositeVisible()
+ */
+ @Override
public boolean isNavBarCompositeVisible() {
GridData gridData = (GridData) navBarComposite.getLayoutData();
return gridData.heightHint != 0;
}
+ /* (non-Javadoc)
+ * @see org.jboss.tools.vpe.browsersim.ui.skin.ios.PhoneComposite#getStopButtonComposite()
+ */
+ @Override
public ImageButtonComposite getStopButtonComposite() {
return navBarComposite.getStopButtonComposite();
}
+ /* (non-Javadoc)
+ * @see org.jboss.tools.vpe.browsersim.ui.skin.ios.PhoneComposite#getRefreshButtonComposite()
+ */
+ @Override
public ImageButtonComposite getRefreshButtonComposite() {
return navBarComposite.getRefreshButtonComposite();
}
+ /* (non-Javadoc)
+ * @see org.jboss.tools.vpe.browsersim.ui.skin.ios.PhoneComposite#getUrlText()
+ */
+ @Override
public Text getUrlText() {
return navBarComposite.getUrlText();
}
+ /* (non-Javadoc)
+ * @see org.jboss.tools.vpe.browsersim.ui.skin.ios.PhoneComposite#getProgressBar()
+ */
+ @Override
public ProgressBar getProgressBar() {
return navBarComposite.getProgressBar();
}
+ /* (non-Javadoc)
+ * @see org.jboss.tools.vpe.browsersim.ui.skin.ios.PhoneComposite#getPageTitleStyledText()
+ */
+ @Override
public StyledText getPageTitleStyledText() {
return navBarComposite.getPageTitleStyledText();
}
+ /* (non-Javadoc)
+ * @see org.jboss.tools.vpe.browsersim.ui.skin.ios.PhoneComposite#addListener(int, org.eclipse.swt.widgets.Listener)
+ */
@Override
public void addListener(int eventType, Listener listener) {
super.addListener(eventType, listener);
@@ -167,6 +213,9 @@
}
}
+ /* (non-Javadoc)
+ * @see org.jboss.tools.vpe.browsersim.ui.skin.ios.PhoneComposite#removeListener(int, org.eclipse.swt.widgets.Listener)
+ */
@Override
public void removeListener(int eventType, Listener listener) {
super.removeListener(eventType, listener);
@@ -181,6 +230,9 @@
}
}
+ /* (non-Javadoc)
+ * @see org.jboss.tools.vpe.browsersim.ui.skin.ios.PhoneComposite#setMenu(org.eclipse.swt.widgets.Menu)
+ */
@Override
public void setMenu(Menu menu) {
super.setMenu(menu);
@@ -189,4 +241,9 @@
child.setMenu(menu);
}
}
+
+ @Override
+ public ImageButtonComposite getHomeButtonComposite() {
+ return null;
+ }
}
Modified: trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/ui/skin/ios/IOSNavBarComposite.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/ui/skin/ios/IOSNavBarComposite.java 2012-04-13 16:32:33 UTC (rev 40184)
+++ trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/ui/skin/ios/IOSNavBarComposite.java 2012-04-13 18:24:03 UTC (rev 40185)
@@ -9,6 +9,8 @@
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.ProgressBar;
import org.eclipse.swt.widgets.Text;
+import org.jboss.tools.vpe.browsersim.ui.skin.ImageButtonComposite;
+import org.jboss.tools.vpe.browsersim.ui.skin.ImageDescriptor;
import org.jboss.tools.vpe.browsersim.ui.skin.ImageList;
Modified: trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/ui/skin/ios/IOsTimeComposite.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/ui/skin/ios/IOsTimeComposite.java 2012-04-13 16:32:33 UTC (rev 40184)
+++ trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/ui/skin/ios/IOsTimeComposite.java 2012-04-13 18:24:03 UTC (rev 40185)
@@ -1,65 +1,23 @@
package org.jboss.tools.vpe.browsersim.ui.skin.ios;
import org.eclipse.swt.SWT;
-import org.eclipse.swt.layout.GridLayout;
import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Listener;
+import org.jboss.tools.vpe.browsersim.ui.skin.AbstractTimeComposite;
+import org.jboss.tools.vpe.browsersim.ui.skin.ImageDescriptor;
import org.jboss.tools.vpe.browsersim.ui.skin.ImageList;
-public class IOsTimeComposite extends Composite {
- private final String BD = "ios/";
- private final ImageDescriptor[] BODY_DESCRIPTOR = {
+public class IOsTimeComposite extends AbstractTimeComposite {
+ private static final String BD = "ios/";
+ private static final ImageDescriptor[] BODY_DESCRIPTOR = {
new ImageDescriptor(BD + "time-1.png"), new ImageDescriptor(BD + "time-2.png", 1, 1, SWT.HORIZONTAL), new ImageDescriptor(BD + "time-3.png"), new ImageDescriptor(BD + "time-4.png", 1, 1, SWT.HORIZONTAL), new ImageDescriptor(BD + "time-5.png")
};
-
- /**
- * Create the composite.
- * @param parent
- * @param style
- */
+
public IOsTimeComposite(Composite parent, ImageList imageList) {
- super(parent, SWT.NONE);
- GridLayout gridLayout = new GridLayout(5, false);
- gridLayout.verticalSpacing = 0;
- gridLayout.horizontalSpacing = 0;
- gridLayout.marginWidth = 0;
- gridLayout.marginHeight = 0;
- setLayout(gridLayout);
-
- for (ImageDescriptor descriptor : BODY_DESCRIPTOR) {
- descriptor.createWidget(this, imageList);
- }
+ super(parent, imageList);
+ System.out.println("ss");
}
- @Override
- protected void checkSubclass() {
- // Disable the check that prevents subclassing of SWT components
+ protected ImageDescriptor[] getBodyDescriptor() {
+ return BODY_DESCRIPTOR;
}
-
- @Override
- public void addListener(int eventType, Listener listener) {
- super.addListener(eventType, listener);
- switch (eventType) {
- case SWT.MouseDown:
- case SWT.MouseUp:
- case SWT.MouseMove:
- for (Control child : getChildren()) {
- child.addListener(eventType, listener);
- }
- }
- }
-
- @Override
- public void removeListener(int eventType, Listener listener) {
- super.removeListener(eventType, listener);
- switch (eventType) {
- case SWT.MouseDown:
- case SWT.MouseUp:
- case SWT.MouseMove:
- for (Control child : getChildren()) {
- child.removeListener(eventType, listener);
- }
- }
- }
}
Modified: trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/ui/skin/ios/IPhoneSkinDescriptor.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/ui/skin/ios/IPhoneSkinDescriptor.java 2012-04-13 16:32:33 UTC (rev 40184)
+++ trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/ui/skin/ios/IPhoneSkinDescriptor.java 2012-04-13 18:24:03 UTC (rev 40185)
@@ -1,5 +1,7 @@
package org.jboss.tools.vpe.browsersim.ui.skin.ios;
+import org.jboss.tools.vpe.browsersim.ui.skin.ImageDescriptor;
+
public class IPhoneSkinDescriptor {
private int bodyGridSize;
private ImageDescriptor[] bodyGridImageDescriptors;
Deleted: trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/ui/skin/ios/ImageButtonComposite.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/ui/skin/ios/ImageButtonComposite.java 2012-04-13 16:32:33 UTC (rev 40184)
+++ trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/ui/skin/ios/ImageButtonComposite.java 2012-04-13 18:24:03 UTC (rev 40185)
@@ -1,95 +0,0 @@
-package org.jboss.tools.vpe.browsersim.ui.skin.ios;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.MouseEvent;
-import org.eclipse.swt.events.MouseTrackListener;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.graphics.Rectangle;
-import org.eclipse.swt.layout.FormData;
-import org.eclipse.swt.widgets.Composite;
-import org.jboss.tools.vpe.browsersim.ui.skin.ImageList;
-
-
-public class ImageButtonComposite extends Composite {
-
- private MouseTrackListener mouseTrackListener;
- private Image enabledImage;
- private Image disabledImage;
- private Image selectedImage;
- protected boolean enabled;
-
- /**
- * Create the composite.
- * @param parent
- * @param style
- */
- public ImageButtonComposite(Composite parent, Image enabledImage, Image disabledImage, Image selectedImage) {
- super(parent, SWT.NONE);
- this.enabledImage = enabledImage;
- this.disabledImage = disabledImage;
- this.selectedImage = selectedImage;
- setEnabled(true);
- addMouseTrackListener(getMouseTrackListener());
- }
-
- public ImageButtonComposite(Composite parent, ImageList imageList, ButtonDescriptor buttonDescriptor) {
- this( parent, imageList.getImage(buttonDescriptor.getEnabledImageName()),
- imageList.getImage(buttonDescriptor.getDisabledImageName()),
- imageList.getImage(buttonDescriptor.getSelectedImageName()) );
-
- FormData formData = buttonDescriptor.getFormData();
- FormData actualFormData = new FormData();
- actualFormData.left = formData.left;
- actualFormData.top = formData.top;
- actualFormData.right = formData.right;
- actualFormData.bottom = formData.bottom;
-
- Rectangle size = enabledImage.getBounds();
- actualFormData.width = size.width;
- actualFormData.height = size.height;
-
- this.setLayoutData(actualFormData);
- }
-
- public void setEnabled(boolean enabled) {
- this.enabled = enabled;
- if (enabled) {
- setBackgroundImage(enabledImage);
- } else {
- setBackgroundImage(disabledImage);
- }
- }
-
- public boolean getEnabled() {
- return enabled;
- }
-
- @Override
- protected void checkSubclass() {
- // Disable the check that prevents subclassing of SWT components
- }
-
- private MouseTrackListener getMouseTrackListener() {
- if (mouseTrackListener == null) {
- mouseTrackListener = new MouseTrackListener() {
- @Override
- public void mouseHover(MouseEvent e) {
- }
-
- @Override
- public void mouseExit(MouseEvent e) {
- if (enabled) {
- setBackgroundImage(enabledImage);
- }
- }
-
- @Override
- public void mouseEnter(MouseEvent e) {
- if (enabled) {
- setBackgroundImage(selectedImage);
- }
- }
- };
- }
- return mouseTrackListener;
- }
-}
Deleted: trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/ui/skin/ios/ImageDescriptor.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/ui/skin/ios/ImageDescriptor.java 2012-04-13 16:32:33 UTC (rev 40184)
+++ trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/ui/skin/ios/ImageDescriptor.java 2012-04-13 18:24:03 UTC (rev 40185)
@@ -1,55 +0,0 @@
-package org.jboss.tools.vpe.browsersim.ui.skin.ios;
-import org.jboss.tools.vpe.browsersim.ui.skin.ImageList;
-import org.jboss.tools.vpe.browsersim.ui.skin.ios.WidgetDescriptor;
-
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.graphics.Rectangle;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.widgets.Composite;
-
-
-public class ImageDescriptor extends WidgetDescriptor {
- protected String imageName;
-
- public ImageDescriptor(String imageName, int horizontalSpan, int verticalSpan, int stretching) {
- super(horizontalSpan, verticalSpan, stretching);
- this.imageName = imageName;
- }
- public ImageDescriptor(String imageName, int horizontalSpan, int verticalSpan) {
- this(imageName, horizontalSpan, verticalSpan, SWT.NONE);
- }
- public ImageDescriptor(String imageName) {
- this(imageName, 1, 1);
- }
-
- public Composite createWidget(Composite parent, ImageList imageList) {
- Composite composite = new Composite(parent, SWT.NONE);
- boolean fillHorizontal = (getStretching() & SWT.HORIZONTAL) != 0;
- boolean fillVertical = (getStretching() & SWT.VERTICAL) != 0;
- GridData gridData = new GridData(
- fillHorizontal ? SWT.FILL: SWT.CENTER,
- fillVertical ? SWT.FILL: SWT.CENTER,
- fillHorizontal, fillVertical,
- getHorizontalSpan(), getVerticalSpan());
-
- String imageName = getImageName();
- if (imageName != null) {
- Image image = imageList.getImage(imageName);
- composite.setBackgroundImage(image);
- Rectangle bounds = image.getBounds();
- gridData.widthHint = fillHorizontal ? SWT.DEFAULT : bounds.width;
- gridData.heightHint = fillVertical ? SWT.DEFAULT : bounds.height;
- } else {
- composite.setBackground(parent.getDisplay().getSystemColor(SWT.COLOR_WHITE));
- }
-
- composite.setLayoutData(gridData);
-
- return composite;
- }
-
- public String getImageName() {
- return imageName;
- }
-}
Deleted: trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/ui/skin/ios/WidgetDescriptor.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/ui/skin/ios/WidgetDescriptor.java 2012-04-13 16:32:33 UTC (rev 40184)
+++ trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/ui/skin/ios/WidgetDescriptor.java 2012-04-13 18:24:03 UTC (rev 40185)
@@ -1,31 +0,0 @@
-package org.jboss.tools.vpe.browsersim.ui.skin.ios;
-import org.eclipse.swt.SWT;
-
-class WidgetDescriptor {
- protected int horizontalSpan;
- protected int verticalSpan;
- protected int stretching;
-
- public WidgetDescriptor(int horizontalSpan, int verticalSpan, int stretching) {
- this.verticalSpan = verticalSpan;
- this.horizontalSpan = horizontalSpan;
- this.stretching = stretching;
- }
-
- public WidgetDescriptor(int horizontalSpan, int verticalSpan) {
- this(horizontalSpan, verticalSpan, SWT.NONE);
- }
- public WidgetDescriptor() {
- this(1, 1);
- }
-
- public int getHorizontalSpan() {
- return horizontalSpan;
- }
- public int getVerticalSpan() {
- return verticalSpan;
- }
- public int getStretching() {
- return stretching;
- }
-}
13 years, 12 months
- 1
- 0
JBoss Tools SVN: r40184 - trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/action.
by jbosstools-commits＠lists.jboss.org
Author: dazarov
Date: 2012-04-13 12:32:33 -0400 (Fri, 13 Apr 2012)
New Revision: 40184
Modified:
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/action/DeleteApplicationAction.java
Log:
When delete of OpenShift application fails the user is not notified JBIDE-11325
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/action/DeleteApplicationAction.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/action/DeleteApplicationAction.java 2012-04-13 16:27:12 UTC (rev 40183)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/action/DeleteApplicationAction.java 2012-04-13 16:32:33 UTC (rev 40184)
@@ -88,6 +88,7 @@
try {
application.destroy();
} catch (OpenShiftException e) {
+ MessageDialog.openError(Display.getCurrent().getActiveShell(), NLS.bind("Failed to delete application \"{0}\"", appName), e.getMessage());
Logger.error(NLS.bind("Failed to delete application \"{0}\"", appName), e);
}
}
13 years, 12 months
- 1
- 0
JBoss Tools SVN: r40183 - trunk/download.jboss.org/jbosstools/updates/development.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2012-04-13 12:27:12 -0400 (Fri, 13 Apr 2012)
New Revision: 40183
Modified:
trunk/download.jboss.org/jbosstools/updates/development/index.html
Log:
fix label for Indigo (SR1 -> SR2)
Modified: trunk/download.jboss.org/jbosstools/updates/development/index.html
===================================================================
--- trunk/download.jboss.org/jbosstools/updates/development/index.html 2012-04-13 16:27:03 UTC (rev 40182)
+++ trunk/download.jboss.org/jbosstools/updates/development/index.html 2012-04-13 16:27:12 UTC (rev 40183)
@@ -2,7 +2,7 @@
<head>
<title>JBoss Tools Development Milestone Update Sites</title>
<style>
-@import url("../web/site.css");
+@import url("../../web/site.css");
</style>
</head>
<body marginheight="0" marginwidth="0" leftmargin="0" topmargin="0">
@@ -39,7 +39,7 @@
</p>
<ul>
- <li><a href="indigo">JBoss Tools 3.3 Development Milestone</a> (requires Eclipse 3.7 Indigo SR1)</li>
+ <li><a href="indigo">JBoss Tools 3.3 Development Milestone</a> (requires Eclipse 3.7 Indigo SR2)</li>
<li><a href="helios">JBoss Tools 3.2 Development Milestone</a> (requires Eclipse 3.6 Helios SR2)</li>
</ul>
</td>
13 years, 12 months
- 1
- 0
JBoss Tools SVN: r40182 - trunk/download.jboss.org/jbosstools/updates.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2012-04-13 12:27:03 -0400 (Fri, 13 Apr 2012)
New Revision: 40182
Modified:
trunk/download.jboss.org/jbosstools/updates/index.html
Log:
link to juno TPs & req site
Modified: trunk/download.jboss.org/jbosstools/updates/index.html
===================================================================
--- trunk/download.jboss.org/jbosstools/updates/index.html 2012-04-13 15:37:56 UTC (rev 40181)
+++ trunk/download.jboss.org/jbosstools/updates/index.html 2012-04-13 16:27:03 UTC (rev 40182)
@@ -61,16 +61,22 @@
<li><a class=link href=nightly>Nightly Builds</a></li>
<br/>
<b>Dependencies & Requirements</b><br/>
-<li><a class=link href=indigo>All JBoss Tools 3.3 dependencies in one update site</a> (for installing or developing with Eclipse 3.7)</li>
+<li><a class=link href=juno>All JBoss Tools 3.3 dependencies in one update site</a> (for installing or developing with <b>Eclipse 4.2</b>)</li>
+<li><a class=link href=indigo>All JBoss Tools 3.3 dependencies in one update site</a> (for installing or developing with <b>Eclipse 3.7</b>)</li>
+<br/>
<li><a class=link href=helios>All JBoss Tools 3.2 dependencies in one update site</a> (for installing or developing with Eclipse 3.6)</li>
<li><a class=link href=requirements>All JBoss Tools dependencies in collection of update site</a> (for installing or developing)</li>
<br/>
<b>JBT Target Platforms</b><br/>
-<li><a class=link href=http://download.jboss.org/jbosstools/updates/target-platform_3.3.ind...>All JBoss Tools 3.3 dependencies in one update site</a> (for installing or developing with Eclipse 3.7)</li>
+<li><a class=link href=http://download.jboss.org/jbosstools/updates/target-platform_3.3.jun...>All JBoss Tools 3.3 dependencies in one update site</a> (for installing or developing with <b>Eclipse 4.2</b>)</li>
+<li><a class=link href=http://download.jboss.org/jbosstools/updates/target-platform_3.3.ind...>All JBoss Tools 3.3 dependencies in one update site</a> (for installing or developing with <b>Eclipse 3.7</b>)</li>
+<br/>
<li><a class=link href=http://download.jboss.org/jbosstools/updates/target-platform>All JBoss Tools 3.2 dependencies in one update site</a> (for installing or developing with Eclipse 3.6)</li>
<br/>
<b>JBDS Target Platforms</b><br/>
-<li><a style="color: red" class=link href=http://www.qa.jboss.com/binaries/RHDS/updates/jbds-target-platform_3...>All JBoss Developer Studio 5.0 dependencies in one update site</a> (for installing or developing with Eclipse 3.7)</li>
+<li><a style="color: red" class=link href=http://www.qa.jboss.com/binaries/RHDS/updates/jbds-target-platform_3...>All JBoss Developer Studio 5.0 dependencies in one update site</a> (for installing or developing with <b>Eclipse 4.2</b>)</li>
+<li><a style="color: red" class=link href=http://www.qa.jboss.com/binaries/RHDS/updates/jbds-target-platform_3...>All JBoss Developer Studio 5.0 dependencies in one update site</a> (for installing or developing with <b>Eclipse 3.7</b>)</li>
+<br/>
<li><a style="color: red" class=link href=http://www.qa.jboss.com/binaries/RHDS/updates/jbds-target-platform>All JBoss Developer Studio 4.x dependencies in one update site</a> (for installing or developing with Eclipse 3.6)</li>
<br/>
<p class="bodyText"><i>Note: <b style="color: red">red
13 years, 12 months
- 1
- 0