JBoss Tools SVN: r22839 - in trunk/maven/plugins/org.jboss.tools.maven.seam: src/org/jboss/tools/maven/seam and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: snjeza
Date: 2010-06-16 16:05:45 -0400 (Wed, 16 Jun 2010)
New Revision: 22839
Modified:
trunk/maven/plugins/org.jboss.tools.maven.seam/poms/parent-pom.xml
trunk/maven/plugins/org.jboss.tools.maven.seam/src/org/jboss/tools/maven/seam/MavenSeamActivator.java
Log:
https://jira.jboss.org/browse/JBIDE-6452 New Seam Web Project with Maven support - problems with test project
Modified: trunk/maven/plugins/org.jboss.tools.maven.seam/poms/parent-pom.xml
===================================================================
--- trunk/maven/plugins/org.jboss.tools.maven.seam/poms/parent-pom.xml 2010-06-16 18:27:24 UTC (rev 22838)
+++ trunk/maven/plugins/org.jboss.tools.maven.seam/poms/parent-pom.xml 2010-06-16 20:05:45 UTC (rev 22839)
@@ -74,6 +74,12 @@
<artifactId>hibernate-entitymanager</artifactId>
<version>${hibernate-entitymanager.version}</version>
<scope>provided</scope>
+ <exclusions>
+ <exclusion>
+ <artifactId>javassist</artifactId>
+ <groupId>javassist</groupId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.jboss.seam</groupId>
Modified: trunk/maven/plugins/org.jboss.tools.maven.seam/src/org/jboss/tools/maven/seam/MavenSeamActivator.java
===================================================================
--- trunk/maven/plugins/org.jboss.tools.maven.seam/src/org/jboss/tools/maven/seam/MavenSeamActivator.java 2010-06-16 18:27:24 UTC (rev 22838)
+++ trunk/maven/plugins/org.jboss.tools.maven.seam/src/org/jboss/tools/maven/seam/MavenSeamActivator.java 2010-06-16 20:05:45 UTC (rev 22839)
@@ -262,6 +262,25 @@
dependency.setArtifactId("slf4j-nop"); //$NON-NLS-1$
dependencies.add(dependency);
+ dependency = new Dependency();
+ dependency.setGroupId("org.drools"); //$NON-NLS-1$
+ dependency.setArtifactId("drools-compiler"); //$NON-NLS-1$
+ dependency.setScope("test"); //$NON-NLS-1$
+ dependencies.add(dependency);
+
+ dependency = new Dependency();
+ dependency.setGroupId("org.jbpm"); //$NON-NLS-1$
+ dependency.setArtifactId("jbpm-jpdl"); //$NON-NLS-1$
+ dependency.setScope("test"); //$NON-NLS-1$
+ dependencies.add(dependency);
+
+ dependency = new Dependency();
+ dependency.setGroupId("org.eclipse.jdt"); //$NON-NLS-1$
+ dependency.setArtifactId("core"); //$NON-NLS-1$
+ dependency.setVersion("3.4.2.v_883_R34x"); //$NON-NLS-1$
+ dependency.setScope("test"); //$NON-NLS-1$
+ dependencies.add(dependency);
+
Build build = new Build();
try {
//build.setFinalName(testProjectName);
15 years, 10 months
- 1
- 0
JBoss Tools SVN: r22838 - in trunk/hibernatetools/plugins: org.hibernate.eclipse.console/src/org/hibernate/eclipse/launch and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: vyemialyanchyk
Date: 2010-06-16 14:27:24 -0400 (Wed, 16 Jun 2010)
New Revision: 22838
Modified:
trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/launch/ConsoleConfigurationJavaClasspathTab.java
trunk/hibernatetools/plugins/org.hibernate.eclipse/src/org/hibernate/console/ConfigurationFactory.java
trunk/hibernatetools/plugins/org.hibernate.eclipse/src/org/hibernate/console/ConnectionProfileUtil.java
trunk/hibernatetools/plugins/org.hibernate.eclipse/src/org/hibernate/console/ConsoleConfiguration.java
Log:
https://jira.jboss.org/browse/JBIDE-6103 - fix -> refactoring: get rid of rejectRefreshProfile, use DriverManager to get correct driver properties instead of ConnectionProfile
Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse/src/org/hibernate/console/ConfigurationFactory.java
===================================================================
--- trunk/hibernatetools/plugins/org.hibernate.eclipse/src/org/hibernate/console/ConfigurationFactory.java 2010-06-16 14:43:09 UTC (rev 22837)
+++ trunk/hibernatetools/plugins/org.hibernate.eclipse/src/org/hibernate/console/ConfigurationFactory.java 2010-06-16 18:27:24 UTC (rev 22838)
@@ -42,6 +42,7 @@
import org.dom4j.io.DOMWriter;
import org.eclipse.datatools.connectivity.IConnectionProfile;
import org.eclipse.datatools.connectivity.ProfileManager;
+import org.eclipse.datatools.connectivity.drivers.DriverInstance;
import org.eclipse.osgi.util.NLS;
import org.hibernate.HibernateException;
import org.hibernate.MappingException;
@@ -64,13 +65,11 @@
private ConsoleConfigurationPreferences prefs;
private Map<String, FakeDelegatingDriver> fakeDrivers;
- private boolean rejectProfileRefresh;
public ConfigurationFactory(ConsoleConfigurationPreferences prefs,
- Map<String, FakeDelegatingDriver> fakeDrivers, boolean rejectProfileRefresh) {
+ Map<String, FakeDelegatingDriver> fakeDrivers) {
this.prefs = prefs;
this.fakeDrivers = fakeDrivers;
- this.rejectProfileRefresh = rejectProfileRefresh;
}
public ConsoleConfigurationPreferences getPreferences() {
@@ -375,36 +374,31 @@
IConnectionProfile profile = ProfileManager.getInstance().getProfileByName(
connectionProfile);
if (profile != null) {
- if (!rejectProfileRefresh) {
- ConnectionProfileUtil.refreshProfile(profile);
- }
- //
+ DriverInstance driverInstance =
+ ConnectionProfileUtil.getDriverDefinition(prefs.getConnectionProfileName());
+ final Properties cpProperties = profile.getProperties(profile.getProviderId());
final Properties invokeProperties = localCfg.getProperties();
// set this property to null!
invokeProperties.remove(Environment.DATASOURCE);
localCfg.setProperties(invokeProperties);
- Properties cpProperties = profile.getProperties(profile.getProviderId());
// seems we should not setup dialect here
// String dialect =
// "org.hibernate.dialect.HSQLDialect";//cpProperties.getProperty("org.eclipse.datatools.connectivity.db.driverClass");
// invoke.setProperty(Environment.DIALECT, dialect);
- String driver = cpProperties
- .getProperty("org.eclipse.datatools.connectivity.db.driverClass"); //$NON-NLS-1$
- localCfg.setProperty(Environment.DRIVER, driver);
+ String driverClass = driverInstance.getProperty("org.eclipse.datatools.connectivity.db.driverClass"); //$NON-NLS-1$
+ localCfg.setProperty(Environment.DRIVER, driverClass);
// TODO:
@SuppressWarnings("unused")
- String driverJarPath = cpProperties.getProperty("jarList"); //$NON-NLS-1$
+ String driverJarPath = driverInstance.getJarList();
String url = cpProperties.getProperty("org.eclipse.datatools.connectivity.db.URL"); //$NON-NLS-1$
// url += "/";// +
// cpProperties.getProperty("org.eclipse.datatools.connectivity.db.databaseName");
localCfg.setProperty(Environment.URL, url);
- String user = cpProperties
- .getProperty("org.eclipse.datatools.connectivity.db.username"); //$NON-NLS-1$
+ String user = cpProperties.getProperty("org.eclipse.datatools.connectivity.db.username"); //$NON-NLS-1$
if (null != user && user.length() > 0) {
localCfg.setProperty(Environment.USER, user);
}
- String pass = cpProperties
- .getProperty("org.eclipse.datatools.connectivity.db.password"); //$NON-NLS-1$
+ String pass = cpProperties.getProperty("org.eclipse.datatools.connectivity.db.password"); //$NON-NLS-1$
if (null != pass && pass.length() > 0) {
localCfg.setProperty(Environment.PASS, pass);
}
@@ -454,4 +448,5 @@
}
}
}
+
}
Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse/src/org/hibernate/console/ConnectionProfileUtil.java
===================================================================
--- trunk/hibernatetools/plugins/org.hibernate.eclipse/src/org/hibernate/console/ConnectionProfileUtil.java 2010-06-16 14:43:09 UTC (rev 22837)
+++ trunk/hibernatetools/plugins/org.hibernate.eclipse/src/org/hibernate/console/ConnectionProfileUtil.java 2010-06-16 18:27:24 UTC (rev 22838)
@@ -21,17 +21,47 @@
*/
package org.hibernate.console;
+import org.eclipse.datatools.connectivity.ConnectionProfileConstants;
import org.eclipse.datatools.connectivity.IConnectionProfile;
+import org.eclipse.datatools.connectivity.ProfileManager;
+import org.eclipse.datatools.connectivity.drivers.DriverInstance;
+/**
+ * @author Vitali Yemialyanchyk
+ */
public class ConnectionProfileUtil {
-
- public static void refreshProfile(IConnectionProfile profile) {
- // refresh profile (refresh jpa connection):
- // get fresh information about current db structure and update error markers
- if (profile.getConnectionState() == IConnectionProfile.CONNECTED_STATE){
- profile.disconnect(null);
+
+ public static String getDriverDefinitionId(IConnectionProfile profile) {
+ if (profile == null) {
+ return null;
}
- profile.connect(null);
+ return profile.getBaseProperties().getProperty(
+ ConnectionProfileConstants.PROP_DRIVER_DEFINITION_ID);
}
-
+
+ public static DriverInstance getDriverDefinition(String connectionProfile) {
+ if (connectionProfile == null) {
+ return null;
+ }
+ IConnectionProfile profile = ProfileManager.getInstance().getProfileByName(
+ connectionProfile);
+ if (profile == null) {
+ return null;
+ }
+ String driverID = getDriverDefinitionId(profile);
+ return org.eclipse.datatools.connectivity.drivers.DriverManager.getInstance()
+ .getDriverInstanceByID(driverID);
+ }
+
+ /*
+ * try get a path to the sql driver jar file from DTP connection profile
+ */
+ public static String getConnectionProfileDriverURL(String connectionProfile) {
+ DriverInstance di = getDriverDefinition(connectionProfile);
+ if (di == null) {
+ return null;
+ }
+ return di.getJarList();
+ }
+
}
Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse/src/org/hibernate/console/ConsoleConfiguration.java
===================================================================
--- trunk/hibernatetools/plugins/org.hibernate.eclipse/src/org/hibernate/console/ConsoleConfiguration.java 2010-06-16 14:43:09 UTC (rev 22837)
+++ trunk/hibernatetools/plugins/org.hibernate.eclipse/src/org/hibernate/console/ConsoleConfiguration.java 2010-06-16 18:27:24 UTC (rev 22838)
@@ -35,10 +35,7 @@
import java.util.Iterator;
import java.util.List;
import java.util.Map;
-import java.util.Properties;
-import org.eclipse.datatools.connectivity.IConnectionProfile;
-import org.eclipse.datatools.connectivity.ProfileManager;
import org.hibernate.Session;
import org.hibernate.SessionFactory;
import org.hibernate.cfg.Configuration;
@@ -60,9 +57,6 @@
/* TODO: move this out to the actual users of the configuraiton/sf ? */
private Configuration configuration;
private SessionFactory sessionFactory;
-
- // internal flag to prohibit long time profile refresh
- private boolean rejectProfileRefresh = false;
/** Unique name for this configuration */
public String getName() {
@@ -125,57 +119,51 @@
}
/*
- * try get a path to the sql driver jar file from DTP connection profile
- */
- protected String getConnectionProfileDriverURL() {
- String connectionProfile = prefs.getConnectionProfileName();
- if (connectionProfile == null) {
- return null;
- }
- IConnectionProfile profile = ProfileManager.getInstance().getProfileByName(connectionProfile);
- if (profile == null) {
- return null;
- }
- if (!rejectProfileRefresh) {
- ConnectionProfileUtil.refreshProfile(profile);
- }
- //
- Properties cpProperties = profile.getProperties(profile.getProviderId());
- String driverJarPath = cpProperties.getProperty("jarList"); //$NON-NLS-1$
- return driverJarPath;
- }
-
- /*
* get custom classpath URLs
*/
protected URL[] getCustomClassPathURLs() {
URL[] customClassPathURLsTmp = prefs.getCustomClassPathURLS();
URL[] customClassPathURLs = null;
- String driverURL = getConnectionProfileDriverURL();
- URL url = null;
+ String driverURL = ConnectionProfileUtil.getConnectionProfileDriverURL(prefs.getConnectionProfileName());
+ URL[] urls = null;
if (driverURL != null) {
- try {
- url = new URL("file:/" + driverURL); //$NON-NLS-1$
- } catch (MalformedURLException e) {
- // just ignore
+ String[] driverURLParts = driverURL.split(";"); //$NON-NLS-1$
+ urls = new URL[driverURLParts.length];
+ for (int i = 0; i < driverURLParts.length; i++) {
+ try {
+ urls[i] = new URL("file:/" + driverURLParts[i].trim()); //$NON-NLS-1$
+ } catch (MalformedURLException e) {
+ urls[i] = null;
+ }
}
}
// should DTP connection profile driver jar file be inserted
- boolean insertFlag = ( url != null );
- if (insertFlag) {
- for (int i = 0; i < customClassPathURLsTmp.length; i++) {
- if (url.equals(customClassPathURLsTmp[i])) {
- insertFlag = false;
- break;
+ int insertItems = ( urls != null ) ? urls.length : 0;
+ if (insertItems > 0) {
+ insertItems = 0;
+ for (int i = 0; i < urls.length; i++) {
+ if (urls[i] == null) {
+ continue;
}
+ int j = 0;
+ for (; j < customClassPathURLsTmp.length; j++) {
+ if (customClassPathURLsTmp[j].equals(urls[i])) {
+ break;
+ }
+ }
+ if (j == customClassPathURLsTmp.length) {
+ urls[insertItems++] = urls[i];
+ }
}
}
- if (insertFlag) {
- customClassPathURLs = new URL[customClassPathURLsTmp.length + 1];
+ if (insertItems > 0) {
+ customClassPathURLs = new URL[customClassPathURLsTmp.length + insertItems];
System.arraycopy(customClassPathURLsTmp, 0,
customClassPathURLs, 0, customClassPathURLsTmp.length);
// insert DTP connection profile driver jar file URL after the default classpath entries
- customClassPathURLs[customClassPathURLsTmp.length] = url;
+ for (int i = 0; i < insertItems; i++) {
+ customClassPathURLs[customClassPathURLsTmp.length + i] = urls[i];
+ }
} else {
customClassPathURLs = customClassPathURLsTmp;
}
@@ -227,7 +215,7 @@
executionContext = new DefaultExecutionContext(getName(), classLoader);
Configuration result = (Configuration)execute(new Command() {
public Object execute() {
- ConfigurationFactory csf = new ConfigurationFactory(prefs, fakeDrivers, rejectProfileRefresh);
+ ConfigurationFactory csf = new ConfigurationFactory(prefs, fakeDrivers);
return csf.createConfiguration(cfg, includeMappings);
}
});
@@ -235,7 +223,6 @@
}
protected ClassLoader getParentClassLoader() {
- //Thread.currentThread().setContextClassLoader(ClassLoader.getSystemClassLoader());
ClassLoader cl = Thread.currentThread().getContextClassLoader();
//ClassLoader cl = ConsoleConfiguration.class.getClassLoader();
return cl;
@@ -410,13 +397,4 @@
}
});
}
-
- public boolean isRejectProfileRefresh() {
- return rejectProfileRefresh;
- }
-
- public void setRejectProfileRefresh(boolean rejectProfileRefresh) {
- this.rejectProfileRefresh = rejectProfileRefresh;
- }
-
}
\ No newline at end of file
Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/launch/ConsoleConfigurationJavaClasspathTab.java
===================================================================
--- trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/launch/ConsoleConfigurationJavaClasspathTab.java 2010-06-16 14:43:09 UTC (rev 22837)
+++ trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/launch/ConsoleConfigurationJavaClasspathTab.java 2010-06-16 18:27:24 UTC (rev 22838)
@@ -63,9 +63,6 @@
if (resUserClasses && resExistArchive) {
try {
ConsoleConfiguration ccTest = new ConsoleConfiguration(new EclipseLaunchConsoleConfigurationPreferences(launchConfig));
- // should not try to connect to db - refresh profile try to create db connection
- // so just reject this
- ccTest.setRejectProfileRefresh(true);
ccTest.buildWith(null, false);
} catch (Exception ex) {
resUserClasses = false;
15 years, 10 months
- 1
- 0
JBoss Tools SVN: r22837 - in trunk/jst/tests/org.jboss.tools.jst.ui.bot.test: src/org/jboss/tools/ui/bot/test and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: vpakan(a)redhat.com
Date: 2010-06-16 10:43:09 -0400 (Wed, 16 Jun 2010)
New Revision: 22837
Modified:
trunk/jst/tests/org.jboss.tools.jst.ui.bot.test/META-INF/MANIFEST.MF
trunk/jst/tests/org.jboss.tools.jst.ui.bot.test/src/org/jboss/tools/ui/bot/test/JBTSWTBotTestCase.java
Log:
JBTSWTBotTestCase now extends SWTTestExt
Modified: trunk/jst/tests/org.jboss.tools.jst.ui.bot.test/META-INF/MANIFEST.MF
===================================================================
--- trunk/jst/tests/org.jboss.tools.jst.ui.bot.test/META-INF/MANIFEST.MF 2010-06-16 14:28:05 UTC (rev 22836)
+++ trunk/jst/tests/org.jboss.tools.jst.ui.bot.test/META-INF/MANIFEST.MF 2010-06-16 14:43:09 UTC (rev 22837)
@@ -14,7 +14,8 @@
org.apache.log4j;bundle-version="1.2.13",
org.jboss.tools.common.text.ext;bundle-version="2.0.0",
org.eclipse.ui.ide;bundle-version="3.5.0",
- org.junit4;bundle-version="4.5.0"
+ org.junit4;bundle-version="4.5.0",
+ org.jboss.tools.ui.bot.ext;bundle-version="3.1.0"
Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Export-Package: org.jboss.tools.test,
Modified: trunk/jst/tests/org.jboss.tools.jst.ui.bot.test/src/org/jboss/tools/ui/bot/test/JBTSWTBotTestCase.java
===================================================================
--- trunk/jst/tests/org.jboss.tools.jst.ui.bot.test/src/org/jboss/tools/ui/bot/test/JBTSWTBotTestCase.java 2010-06-16 14:28:05 UTC (rev 22836)
+++ trunk/jst/tests/org.jboss.tools.jst.ui.bot.test/src/org/jboss/tools/ui/bot/test/JBTSWTBotTestCase.java 2010-06-16 14:43:09 UTC (rev 22837)
@@ -14,8 +14,9 @@
import org.eclipse.swtbot.swt.finder.exceptions.WidgetNotFoundException;
import org.eclipse.swtbot.swt.finder.utils.SWTBotPreferences;
import org.eclipse.swtbot.swt.finder.widgets.SWTBotTree;
+import org.jboss.tools.ui.bot.ext.SWTTestExt;
-public abstract class JBTSWTBotTestCase extends SWTBotTestCase implements
+public abstract class JBTSWTBotTestCase extends SWTTestExt implements
ILogListener {
protected static final String BUILDING_WS = "Building workspace"; //$NON-NLS-1$
15 years, 10 months
- 1
- 0
JBoss Tools SVN: r22836 - in trunk/cdi: plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl and 3 other directories.
by jbosstools-commits＠lists.jboss.org
Author: akazakov
Date: 2010-06-16 10:28:05 -0400 (Wed, 16 Jun 2010)
New Revision: 22836
Modified:
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/CDIConstants.java
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/CDIUtil.java
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IInjectionPoint.java
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/InjectionPointField.java
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/InjectionPointMethod.java
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/InjectionPointParameter.java
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/CDICoreValidator.java
trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/preferences/CDIConfigurationBlock.java
trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/ValidationTest.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-2708 Added new validation rule: bean that declares any scope other than @Dependent has an injection point of type InjectionPoint and qualifier @Default
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/CDIConstants.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/CDIConstants.java 2010-06-16 14:12:54 UTC (rev 22835)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/CDIConstants.java 2010-06-16 14:28:05 UTC (rev 22836)
@@ -56,4 +56,6 @@
public String DISPOSES_ANNOTATION_TYPE_NAME = "javax.enterprise.inject.Disposes";
public String OBSERVERS_ANNOTATION_TYPE_NAME = "javax.enterprise.event.Observes";
+
+ public String INJECTIONPOINT_TYPE_NAME = "javax.enterprise.inject.spi.InjectionPoint";
}
\ No newline at end of file
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/CDIUtil.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/CDIUtil.java 2010-06-16 14:12:54 UTC (rev 22835)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/CDIUtil.java 2010-06-16 14:28:05 UTC (rev 22836)
@@ -695,4 +695,23 @@
}
};
}
+
+ /**
+ * Returns true if the injection point declares @Default qualifier or doesn't declare any qualifier at all.
+ *
+ * @param point
+ * @return
+ */
+ public static boolean containsDefaultQualifier(IInjectionPoint point) {
+ Set<IQualifierDeclaration> declarations = point.getQualifierDeclarations();
+ if(declarations.isEmpty()) {
+ return true;
+ }
+ for (IQualifierDeclaration declaration : declarations) {
+ if(CDIConstants.DEFAULT_QUALIFIER_TYPE_NAME.equals(declaration.getQualifier().getSourceType().getFullyQualifiedName())) {
+ return true;
+ }
+ }
+ return false;
+ }
}
\ No newline at end of file
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IInjectionPoint.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IInjectionPoint.java 2010-06-16 14:12:54 UTC (rev 22835)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IInjectionPoint.java 2010-06-16 14:28:05 UTC (rev 22836)
@@ -34,6 +34,13 @@
Set<IQualifierDeclaration> getQualifierDeclarations();
/**
+ * Returns true if the injection point declares @Default qualifier or doesn't declare any qualifier at all.
+ *
+ * @return true if the injection point declares @Default qualifier or doesn't declare any qualifier at all
+ */
+ boolean hasDefaultQualifier();
+
+ /**
* Determines if the injection point is a decorator delegate injection
* point.
*
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/InjectionPointField.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/InjectionPointField.java 2010-06-16 14:12:54 UTC (rev 22835)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/InjectionPointField.java 2010-06-16 14:28:05 UTC (rev 22836)
@@ -11,6 +11,7 @@
package org.jboss.tools.cdi.internal.core.impl;
import org.jboss.tools.cdi.core.CDIConstants;
+import org.jboss.tools.cdi.core.CDIUtil;
import org.jboss.tools.cdi.core.IAnnotationDeclaration;
import org.jboss.tools.cdi.core.IInjectionPointField;
@@ -46,4 +47,12 @@
public IAnnotationDeclaration getInjectAnnotation() {
return definition.getAnnotation(CDIConstants.INJECT_ANNOTATION_TYPE_NAME);
}
+
+ /*
+ * (non-Javadoc)
+ * @see org.jboss.tools.cdi.core.IInjectionPoint#containsDefaultQualifier()
+ */
+ public boolean hasDefaultQualifier() {
+ return CDIUtil.containsDefaultQualifier(this);
+ }
}
\ No newline at end of file
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/InjectionPointMethod.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/InjectionPointMethod.java 2010-06-16 14:12:54 UTC (rev 22835)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/InjectionPointMethod.java 2010-06-16 14:28:05 UTC (rev 22836)
@@ -10,6 +10,7 @@
******************************************************************************/
package org.jboss.tools.cdi.internal.core.impl;
+import org.jboss.tools.cdi.core.CDIUtil;
import org.jboss.tools.cdi.core.IAnnotationDeclaration;
import org.jboss.tools.cdi.core.IInjectionPointMethod;
@@ -41,4 +42,12 @@
public IAnnotationDeclaration getInjectAnnotation() {
return inject;
}
+
+ /*
+ * (non-Javadoc)
+ * @see org.jboss.tools.cdi.core.IInjectionPoint#containsDefaultQualifier()
+ */
+ public boolean hasDefaultQualifier() {
+ return CDIUtil.containsDefaultQualifier(this);
+ }
}
\ No newline at end of file
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/InjectionPointParameter.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/InjectionPointParameter.java 2010-06-16 14:12:54 UTC (rev 22835)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/InjectionPointParameter.java 2010-06-16 14:28:05 UTC (rev 22836)
@@ -14,6 +14,7 @@
import java.util.Set;
import org.jboss.tools.cdi.core.CDIConstants;
+import org.jboss.tools.cdi.core.CDIUtil;
import org.jboss.tools.cdi.core.IAnnotationDeclaration;
import org.jboss.tools.cdi.core.IInjectionPointParameter;
import org.jboss.tools.cdi.core.IQualifier;
@@ -58,4 +59,12 @@
public IAnnotationDeclaration getInjectAnnotation() {
return beanMethod.inject;
}
+
+ /*
+ * (non-Javadoc)
+ * @see org.jboss.tools.cdi.core.IInjectionPoint#containsDefaultQualifier()
+ */
+ public boolean hasDefaultQualifier() {
+ return CDIUtil.containsDefaultQualifier(this);
+ }
}
\ No newline at end of file
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/CDICoreValidator.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/CDICoreValidator.java 2010-06-16 14:12:54 UTC (rev 22835)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/CDICoreValidator.java 2010-06-16 14:28:05 UTC (rev 22836)
@@ -69,9 +69,6 @@
import org.jboss.tools.cdi.internal.core.impl.SessionBean;
import org.jboss.tools.common.model.util.EclipseJavaUtil;
import org.jboss.tools.common.text.ITextSourceReference;
-import org.jboss.tools.jst.web.kb.IKbProject;
-import org.jboss.tools.jst.web.kb.KbProjectFactory;
-import org.jboss.tools.jst.web.kb.internal.KbProject;
import org.jboss.tools.jst.web.kb.internal.validation.ContextValidationHelper;
import org.jboss.tools.jst.web.kb.internal.validation.ValidatingProjectSet;
import org.jboss.tools.jst.web.kb.internal.validation.ValidatorManager;
@@ -994,7 +991,18 @@
} else if(bean instanceof IInterceptor) {
addError(CDIValidationMessages.INJECTED_INTERCEPTOR, CDIPreferences.INJECTED_INTERCEPTOR, reference, injection.getResource());
}
- }
+ }
+ /*
+ * 5.5.7. Injection point metadata
+ * - bean that declares any scope other than @Dependent has an injection point of type InjectionPoint and qualifier @Default
+ */
+ IType type = injection.getType().getType();
+ if(type!=null && CDIConstants.INJECTIONPOINT_TYPE_NAME.equals(type.getFullyQualifiedName())) {
+ IScope beanScope = injection.getClassBean().getScope();
+ if(injection.hasDefaultQualifier() && beanScope!=null && !CDIConstants.DEPENDENT_ANNOTATION_TYPE_NAME.equals(beanScope.getSourceType().getFullyQualifiedName())) {
+ addError(CDIValidationMessages.ILLEGAL_SCOPE_WHEN_TYPE_INJECTIONPOINT_IS_INJECTED, CDIPreferences.ILLEGAL_SCOPE_WHEN_TYPE_INJECTIONPOINT_IS_INJECTED, reference, injection.getResource());
+ }
+ }
}
}
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/preferences/CDIConfigurationBlock.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/preferences/CDIConfigurationBlock.java 2010-06-16 14:12:54 UTC (rev 22835)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/preferences/CDIConfigurationBlock.java 2010-06-16 14:28:05 UTC (rev 22836)
@@ -69,7 +69,7 @@
{CDIPreferences.ILLEGAL_SCOPE_FOR_SESSION_BEAN, CDIPreferencesMessages.CDIValidatorConfigurationBlock_pb_illegalScopeForSessionBean_label},
{CDIPreferences.ILLEGAL_SCOPE_FOR_PRODUCER_METHOD, CDIPreferencesMessages.CDIValidatorConfigurationBlock_pb_illegalScopeForProducerMethod_label},
{CDIPreferences.ILLEGAL_SCOPE_FOR_PRODUCER_FIELD, CDIPreferencesMessages.CDIValidatorConfigurationBlock_pb_illegalScopeForProducerField_label},
-// {CDIPreferences.ILLEGAL_SCOPE_WHEN_TYPE_INJECTIONPOINT_IS_INJECTED, CDIPreferencesMessages.CDIValidatorConfigurationBlock_pb_illegalScopeWhenTypeInjectionPointIsInjected_label},
+ {CDIPreferences.ILLEGAL_SCOPE_WHEN_TYPE_INJECTIONPOINT_IS_INJECTED, CDIPreferencesMessages.CDIValidatorConfigurationBlock_pb_illegalScopeWhenTypeInjectionPointIsInjected_label},
{CDIPreferences.ILLEGAL_SCOPE_FOR_INTERCEPTOR, CDIPreferencesMessages.CDIValidatorConfigurationBlock_pb_illegalScopeForInterceptor_label},
{CDIPreferences.ILLEGAL_SCOPE_FOR_DECORATOR, CDIPreferencesMessages.CDIValidatorConfigurationBlock_pb_illegalScopeForDecorator_label},
},
Modified: trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/ValidationTest.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/ValidationTest.java 2010-06-16 14:12:54 UTC (rev 22835)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/ValidationTest.java 2010-06-16 14:28:05 UTC (rev 22836)
@@ -983,6 +983,17 @@
}
/**
+ * 5.5.7. Injection point metadata
+ * - bean that declares any scope other than @Dependent has an injection point of type InjectionPoint and qualifier @Default
+ *
+ * @throws Exception
+ */
+ public void testSessionScopedBeanWithInjectionPoint() throws Exception {
+ IFile file = tckProject.getFile("JavaSource/org/jboss/jsr299/tck/tests/lookup/injectionpoint/broken/normal/scope/Cat_Broken.java");
+ AbstractResourceMarkerTest.assertMarkerIsCreated(file, AbstractResourceMarkerTest.MARKER_TYPE, CDIValidationMessages.ILLEGAL_SCOPE_WHEN_TYPE_INJECTIONPOINT_IS_INJECTED, 27);
+ }
+
+ /**
* 10.4.2. Declaring an observer method
* - method has more than one parameter annotated @Observes
*
15 years, 10 months
- 1
- 0
JBoss Tools SVN: r22835 - in trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe: editor/menu and 2 other directories.
by jbosstools-commits＠lists.jboss.org
Author: dmaliarevich
Date: 2010-06-16 10:12:54 -0400 (Wed, 16 Jun 2010)
New Revision: 22835
Modified:
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/dialog/ExternalizeStringsWizardPage.java
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/menu/ExternalizeStringsContributionItem.java
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/menu/action/ExternalizeStringsAction.java
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/messages/VpeUIMessages.java
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/messages/messages.properties
Log:
https://jira.jboss.org/browse/JBIDE-6287 , comments were added, plus some insignificant adjustments.
Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/dialog/ExternalizeStringsWizardPage.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/dialog/ExternalizeStringsWizardPage.java 2010-06-16 13:23:16 UTC (rev 22834)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/dialog/ExternalizeStringsWizardPage.java 2010-06-16 14:12:54 UTC (rev 22835)
@@ -122,10 +122,6 @@
rbComboStatus = new Status(IStatus.OK, VpePlugin.PLUGIN_ID, Constants.EMPTY);
}
- public ExternalizeStringsWizardPage(String pageName) {
- super(pageName);
- }
-
public void createControl(Composite parent) {
Composite composite = new Composite(parent, SWT.NONE);
@@ -288,50 +284,60 @@
setControl(composite);
}
+ /**
+ * Initialize dialog's controls.
+ * Fill in appropriate text and make validation.
+ */
private void initializeTextFields() {
- if (bm == null){
- VpePlugin.getDefault().logWarning(
- VpeUIMessages.EXTERNALIZE_STRINGS_DIALOG_INITIALIZATION_ERROR);
- } else {
- ISelection sel = editor.getSelectionProvider().getSelection();
- if ((propsValue != null) && (propsKey != null)
- && isSelectionCorrect(sel)) {
- String text = Constants.EMPTY;
- String stringToUpdate = Constants.EMPTY;
- TextSelection textSelection = null;
- IStructuredSelection structuredSelection = (IStructuredSelection) sel;
- textSelection = (TextSelection) sel;
- text = textSelection.getText();
- Object selectedElement = structuredSelection.getFirstElement();
- /*
- * When selected text in empty
- * parse selected element and find a string to replace.
- */
- if ((text.trim().length() == 0)) {
- if (selectedElement instanceof org.w3c.dom.Text) {
- org.w3c.dom.Text textNode = (org.w3c.dom.Text) selectedElement;
- if (textNode.getNodeValue().trim().length() > 0) {
- stringToUpdate = textNode.getNodeValue();
- editor.getSelectionProvider().setSelection(new StructuredSelection(stringToUpdate));
- }
- } else if (selectedElement instanceof Attr) {
- Attr attrNode = (Attr) selectedElement;
- if (attrNode.getNodeValue().trim().length() > 0) {
- stringToUpdate = attrNode.getNodeValue();
- editor.getSelectionProvider().setSelection(new StructuredSelection(stringToUpdate));
- }
+ ISelection sel = editor.getSelectionProvider().getSelection();
+ if (isSelectionCorrect(sel)) {
+ String text = Constants.EMPTY;
+ String stringToUpdate = Constants.EMPTY;
+ TextSelection textSelection = null;
+ IStructuredSelection structuredSelection = (IStructuredSelection) sel;
+ textSelection = (TextSelection) sel;
+ text = textSelection.getText();
+ Object selectedElement = structuredSelection.getFirstElement();
+ /*
+ * When selected text in empty
+ * parse selected element and find a string to replace..
+ */
+ if ((text.trim().length() == 0)) {
+ if (selectedElement instanceof org.w3c.dom.Text) {
+ /*
+ * ..it could be a plain text
+ */
+ org.w3c.dom.Text textNode = (org.w3c.dom.Text) selectedElement;
+ if (textNode.getNodeValue().trim().length() > 0) {
+ stringToUpdate = textNode.getNodeValue();
+ editor.getSelectionProvider().setSelection(new StructuredSelection(stringToUpdate));
}
- if ((stringToUpdate.trim().length() > 0)) {
- text = stringToUpdate;
+ } else if (selectedElement instanceof Attr) {
+ /*
+ * ..or an attribute's value
+ */
+ Attr attrNode = (Attr) selectedElement;
+ if (attrNode.getNodeValue().trim().length() > 0) {
+ stringToUpdate = attrNode.getNodeValue();
+ editor.getSelectionProvider().setSelection(new StructuredSelection(stringToUpdate));
}
}
- /*
- * Update text string field
- */
- propsValue.setText(text.trim());
- /*
- * Initialize bundle messages field
- */
+ if ((stringToUpdate.trim().length() > 0)) {
+ text = stringToUpdate;
+ }
+ }
+ /*
+ * Update text string field.
+ * Trim the text to remove line breaks and caret returns.
+ */
+ propsValue.setText(text.trim());
+ /*
+ * Initialize bundle messages field
+ */
+ if (bm == null) {
+ VpePlugin.getDefault().logWarning(
+ VpeUIMessages.EXTERNALIZE_STRINGS_DIALOG_RB_IS_MISSING);
+ } else {
BundleEntry[] bundles = bm.getBundles();
Set<String> uriSet = new HashSet<String>();
for (BundleEntry bundleEntry : bundles) {
@@ -340,27 +346,38 @@
rbCombo.add(bundleEntry.uri);
}
}
- /*
- * Update status message.
- */
- updateStatus();
- } else {
- VpePlugin.getDefault().logWarning(
- VpeUIMessages.EXTERNALIZE_STRINGS_DIALOG_INITIALIZATION_ERROR);
}
+ /*
+ * Update status message.
+ */
+ updateStatus();
+ } else {
+ VpePlugin.getDefault().logWarning(
+ VpeUIMessages.EXTERNALIZE_STRINGS_DIALOG_INITIALIZATION_ERROR);
}
}
- private boolean isSelectionCorrect(ISelection sel) {
- if ((sel instanceof TextSelection)
- && (sel instanceof IStructuredSelection)
- && (((IStructuredSelection) sel).size() == 1)) {
+ /**
+ * Checks user has selected a correct string.
+ *
+ * @param selection the current selection
+ * @return <code>true</code> if correct
+ */
+ private boolean isSelectionCorrect(ISelection selection) {
+ if ((selection instanceof TextSelection)
+ && (selection instanceof IStructuredSelection)
+ && (((IStructuredSelection) selection).size() == 1)) {
return true;
- } else {
- return false;
- }
+ }
+ return false;
}
+ /**
+ * Checks keys in the selected resource bundle.
+ *
+ * @param key the key name
+ * @return <code>true</code> if there is a key with the specified name
+ */
private boolean isDuplicatedKey(String key) {
boolean isDupliacted = false;
if ((tagsTable.getItemCount() > 0) && (null != key) && !isNewFile()) {
@@ -375,11 +392,17 @@
return isDupliacted;
}
+ /**
+ * Update resource bundle table according to the selected file:
+ * it fills key and value columns.
+ *
+ * @param file the resource bundle file
+ */
private void updateTable(IFile file) {
if ((file != null) && file.exists()) {
try {
/*
- * Rad file content
+ * Read the file content
*/
BufferedReader in = new BufferedReader(new InputStreamReader(
file.getContents()));
@@ -405,6 +428,8 @@
}
line = in.readLine();
}
+ in.close();
+ in = null;
} catch (CoreException e) {
VpePlugin.getDefault().logError(
"Could not load file content for '" + file + "'", e); //$NON-NLS-1$ //$NON-NLS-2$
@@ -418,6 +443,11 @@
}
}
+ /**
+ * Enables or disables resource bundle information
+ *
+ * @param enabled shows the status
+ */
private void enableBundleGroup(boolean enabled) {
propsFilesGroup.setEnabled(enabled);
propsFileLabel.setEnabled(enabled);
@@ -427,19 +457,36 @@
tagsTable.setEnabled(enabled);
}
+ /**
+ * Gets <code>key=value</code> pair
+ *
+ * @return a pair <code>\nkey=value\n</code>
+ */
public String getKeyValuePair() {
return "\n" + propsKey.getText() + Constants.EQUAL + propsValue.getText() + "\n"; //$NON-NLS-1$ //$NON-NLS-2$
}
+ /**
+ * Gets resource bundle's file
+ * @return the file
+ */
public IFile getBundleFile() {
return bm.getBundleFile(rbCombo.getText());
}
+ /**
+ * Check if "Create new file.." option is enabled
+ *
+ * @return the status
+ */
public boolean isNewFile() {
return newFile.getSelection();
}
- public boolean replaceText() {
+ /**
+ * Replaces the text in the current file
+ */
+ public void replaceText() {
IDocumentProvider prov = editor.getDocumentProvider();
IDocument doc = prov.getDocument(editor.getEditorInput());
ISelection sel = editor.getSelectionProvider().getSelection();
@@ -453,6 +500,11 @@
Object firstElement = structuredSelection.getFirstElement();
int offset = 0;
int length = 0;
+ /*
+ * When user selection is empty
+ * underlying node will e automatically selected.
+ * Thus we need to correct replacement offsets.
+ */
if ((textSel.getLength() != 0)) {
offset = textSel.getOffset();
length = textSel.getLength();
@@ -485,9 +537,11 @@
ex.printStackTrace();
}
}
- return true;
}
+ /**
+ * Update duplicate key status.
+ */
private void updateDuplicateKeyStatus() {
if (isDuplicatedKey(propsKey.getText())) {
rbComboStatus = new Status(
@@ -514,6 +568,9 @@
}
}
+ /**
+ * Update properties key status.
+ */
private void updatePropertiesKeyStatus() {
if ((propsKey.getText() == null)
|| (Constants.EMPTY.equalsIgnoreCase(propsKey.getText().trim()))) {
@@ -526,6 +583,9 @@
}
}
+ /**
+ * Update page status.
+ */
private void updateStatus() {
/*
* Update all statuses
@@ -543,6 +603,12 @@
setPageComplete(isPageComplete());
}
+ /**
+ * Apply status to the dialog.
+ *
+ * @param page the page
+ * @param statuses all the statuses
+ */
private void applyStatus(DialogPage page, IStatus[] statuses) {
IStatus severeStatus = statuses[0];
for (IStatus status : statuses) {
@@ -599,6 +665,13 @@
&& (newFile.getSelection() == true);
}
+ /**
+ * Creates new bundle map if no one was specified
+ * during initialization of the page.
+ *
+ * @param editor the source editor
+ * @return the new bundle map
+ */
private BundleMap createBundleMap(StructuredTextEditor editor) {
String uri = null;
String prefix = null;
@@ -624,7 +697,6 @@
} catch (CoreException e) {
VpePlugin.getPluginLog().logError(e);
}
-
/*
* Get Bundles from faces-config.xml
*/
@@ -651,7 +723,6 @@
}
}
}
-
/*
* Add bundles from <f:loadBundle> tags
*/
Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/menu/ExternalizeStringsContributionItem.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/menu/ExternalizeStringsContributionItem.java 2010-06-16 13:23:16 UTC (rev 22834)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/menu/ExternalizeStringsContributionItem.java 2010-06-16 14:12:54 UTC (rev 22835)
@@ -17,12 +17,20 @@
public class ExternalizeStringsContributionItem extends ActionContributionItem {
+ /**
+ * Instantiates a new externalize strings contribution item.
+ * Default constructor is used to create
+ * source editor context menu from plugin.xml
+ */
public ExternalizeStringsContributionItem() {
super(new ExternalizeStringsAction());
}
@Override
public void fill(Menu parent, int index) {
+ /*
+ * Simply sets the title
+ */
getAction().setText(VpeUIMessages.EXTERNALIZE_STRINGS);
super.fill(parent, index);
}
Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/menu/action/ExternalizeStringsAction.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/menu/action/ExternalizeStringsAction.java 2010-06-16 13:23:16 UTC (rev 22834)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/menu/action/ExternalizeStringsAction.java 2010-06-16 14:12:54 UTC (rev 22835)
@@ -38,6 +38,9 @@
if ((sel instanceof TextSelection)
&& (sel instanceof IStructuredSelection)
&& (((IStructuredSelection) sel).size() == 1)) {
+ /*
+ * Pass null for Bundle Map that it will be created by the page itself.
+ */
ExternalizeStringsDialog dlg = new ExternalizeStringsDialog(
PlatformUI.getWorkbench().getDisplay().getActiveShell(),
new ExternalizeStringsWizard(editor.getSourceEditor(), null));
Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/messages/VpeUIMessages.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/messages/VpeUIMessages.java 2010-06-16 13:23:16 UTC (rev 22834)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/messages/VpeUIMessages.java 2010-06-16 14:12:54 UTC (rev 22835)
@@ -168,6 +168,7 @@
public static String EXTERNALIZE_STRINGS_DIALOG_PROPS_STRINGS_GROUP;
public static String EXTERNALIZE_STRINGS_DIALOG_PROPS_FILES_GROUP;
public static String EXTERNALIZE_STRINGS_DIALOG_INITIALIZATION_ERROR;
+ public static String EXTERNALIZE_STRINGS_DIALOG_RB_IS_MISSING;
public static String EXTERNALIZE_STRINGS_DIALOG_WRONG_SELECTION;
public static String EXTERNALIZE_STRINGS_DIALOG_WRONG_SELECTED_TEXT;
public static String EXTERNALIZE_STRINGS_DIALOG_PLEASE_SELECT_BUNDLE;
Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/messages/messages.properties
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/messages/messages.properties 2010-06-16 13:23:16 UTC (rev 22834)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/messages/messages.properties 2010-06-16 14:12:54 UTC (rev 22835)
@@ -156,6 +156,7 @@
EXTERNALIZE_STRINGS_DIALOG_PROPS_STRINGS_GROUP=Externalize strings
EXTERNALIZE_STRINGS_DIALOG_PROPS_FILES_GROUP=Handle properties file
EXTERNALIZE_STRINGS_DIALOG_INITIALIZATION_ERROR=Could not initialize externalization dialog!
+EXTERNALIZE_STRINGS_DIALOG_RB_IS_MISSING=Could not initialize resource bundles!
EXTERNALIZE_STRINGS_DIALOG_WRONG_SELECTION=Wrong selection! Please select correct string.
EXTERNALIZE_STRINGS_DIALOG_WRONG_SELECTED_TEXT=Wrong selected text. Please select correct string.
EXTERNALIZE_STRINGS_DIALOG_PLEASE_SELECT_BUNDLE=- Please select bundle -
15 years, 10 months
- 1
- 0
JBoss Tools SVN: r22834 - in trunk/vpe/plugins/org.jboss.tools.vpe: src/org/jboss/tools/vpe/editor/bundle and 5 other directories.
by jbosstools-commits＠lists.jboss.org
Author: dmaliarevich
Date: 2010-06-16 09:23:16 -0400 (Wed, 16 Jun 2010)
New Revision: 22834
Added:
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/menu/ExternalizeStringsContributionItem.java
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/menu/action/ExternalizeStringsAction.java
Modified:
trunk/vpe/plugins/org.jboss.tools.vpe/plugin.xml
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/bundle/BundleMap.java
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/dialog/ExternalizeStringsWizard.java
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/dialog/ExternalizeStringsWizardPage.java
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/mozilla/MozillaEditor.java
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/messages/VpeUIMessages.java
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/messages/messages.properties
Log:
https://jira.jboss.org/browse/JBIDE-6287 , Menu item was added to the Souece cotext menu, selection was updated.
Modified: trunk/vpe/plugins/org.jboss.tools.vpe/plugin.xml
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/plugin.xml 2010-06-16 12:32:25 UTC (rev 22833)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/plugin.xml 2010-06-16 13:23:16 UTC (rev 22834)
@@ -99,6 +99,13 @@
id="org.jboss.tools.vpe.editor.menu.SetupTemplateContributionItem">
</dynamic>
</menuContribution>
+ <menuContribution
+ locationURI="popup:org.jboss.tools.jst.jsp.jspeditor.JSPTextEditor.source.EditorContext?after=org.jboss.tools.vpe.editor.menu.SetupTemplateContributionItem">
+ <dynamic
+ class="org.jboss.tools.vpe.editor.menu.ExternalizeStringsContributionItem"
+ id="org.jboss.tools.vpe.editor.menu.ExternalizeStringsContributionItem">
+ </dynamic>
+ </menuContribution>
</extension>
<extension
point="org.eclipse.ui.menus">
Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/bundle/BundleMap.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/bundle/BundleMap.java 2010-06-16 12:32:25 UTC (rev 22833)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/bundle/BundleMap.java 2010-06-16 13:23:16 UTC (rev 22834)
@@ -59,7 +59,10 @@
public class BundleMap {
public static final String TITLE_ATTRIBUTE_NAME = "title"; //$NON-NLS-1$
-
+ private static final String[] JSF_PROJECT_NATURES = {
+ WebProject.JSF_NATURE_ID
+ };
+
private BundleMapListener[] bundleMapListeners = new BundleMapListener[0];
private StructuredTextEditor editor;
@@ -92,48 +95,47 @@
}
public void refreshRegisteredBundles() {
- if (!hasJsfProjectNatureType()
- || !(editor.getEditorInput() instanceof IFileEditorInput)) {
- return;
+ if (hasJsfProjectNatureType()
+ && (editor.getEditorInput() instanceof IFileEditorInput)) {
+ IProject project = ((IFileEditorInput) editor.getEditorInput())
+ .getFile().getProject();
+ IModelNature modelNature = EclipseResourceUtil
+ .getModelNature(project);
+ if (modelNature != null) {
+ XModel model = modelNature.getModel();
+ List<Object> l = WebPromptingProvider.getInstance().getList(
+ model, WebPromptingProvider.JSF_REGISTERED_BUNDLES,
+ null, null);
+ if (l != null && l.size() > 1 && (l.get(1) instanceof Map)) {
+ Map<?, ?> map = (Map<?, ?>) l.get(1);
+ /*
+ * Fix for https://jira.jboss.org/jira/browse/JBIDE-5218
+ * When updating f:view's locale attribute right after
+ * template creation - map of registered bundles is empty
+ * and couldn't be updated. To change bundle's locale they
+ * should be accessed through <code>bundles</code> variable.
+ */
+ if (map.keySet().size() > 0) {
+ Iterator<?> it = map.keySet().iterator();
+ while (it.hasNext()) {
+ String uri = it.next().toString();
+ String prefix = map.get(uri).toString();
+ int hash = (prefix + ":" + uri).hashCode(); //$NON-NLS-1$
+ removeBundle(hash);
+ addBundle(hash, prefix, uri, true);
+ }
+ } else if (bundles.length > 0) {
+ for (int i = 0; i < bundles.length; i++) {
+ String uri = bundles[i].uri;
+ String prefix = bundles[i].prefix;
+ int hash = (prefix + ":" + uri).hashCode(); //$NON-NLS-1$
+ removeBundle(hash);
+ addBundle(hash, prefix, uri, true);
+ }
+ }
+ }
+ }
}
- IProject project = ((IFileEditorInput) editor.getEditorInput())
- .getFile().getProject();
- IModelNature modelNature = EclipseResourceUtil.getModelNature(project);
- if (modelNature == null) {
- return;
- }
- XModel model = modelNature.getModel();
- List<Object> l = WebPromptingProvider.getInstance().getList(model,
- WebPromptingProvider.JSF_REGISTERED_BUNDLES, null, null);
- if (l == null || l.size() < 2 || !(l.get(1) instanceof Map)) {
- return;
- }
- Map<?, ?> map = (Map<?, ?>) l.get(1);
- /*
- * Fix for https://jira.jboss.org/jira/browse/JBIDE-5218
- * When updating f:view's locale attribute right after template creation -
- * map of registered bundles is empty and couldn't be updated.
- * To change bundle's locale they should be accessed through
- * <code>bundles</code> variable.
- */
- if (map.keySet().size() > 0) {
- Iterator<?> it = map.keySet().iterator();
- while (it.hasNext()) {
- String uri = it.next().toString();
- String prefix = map.get(uri).toString();
- int hash = (prefix + ":" + uri).hashCode(); //$NON-NLS-1$
- removeBundle(hash);
- addBundle(hash, prefix, uri, true);
- }
- } else if (bundles.length > 0) {
- for (int i = 0; i < bundles.length; i++) {
- String uri = bundles[i].uri;
- String prefix = bundles[i].prefix;
- int hash = (prefix + ":" + uri).hashCode(); //$NON-NLS-1$
- removeBundle(hash);
- addBundle(hash, prefix, uri, true);
- }
- }
}
public void clearAll() {
@@ -149,25 +151,24 @@
return showBundleUsageAsEL;
}
- private static final String[] JSF_PROJECT_NATURES = {
- WebProject.JSF_NATURE_ID
- };
-
private boolean hasJsfProjectNatureType() {
+ boolean hasJsfProjectNatureType = false;
try {
IEditorInput ei = editor.getEditorInput();
- if(!(ei instanceof IFileEditorInput)) return false;
- IProject project = ((IFileEditorInput)ei).getFile().getProject();
- if (!project.exists() || !project.isOpen()) return false;
-
- for (int i = 0; i < JSF_PROJECT_NATURES.length; i++) {
- if (project.hasNature(JSF_PROJECT_NATURES[i]))
- return true;
+ if(ei instanceof IFileEditorInput) {
+ IProject project = ((IFileEditorInput)ei).getFile().getProject();
+ if (project.exists() && project.isOpen()) {
+ for (int i = 0; i < JSF_PROJECT_NATURES.length; i++) {
+ if (project.hasNature(JSF_PROJECT_NATURES[i]))
+ hasJsfProjectNatureType = true;
+ break;
+ }
+ }
}
} catch (CoreException e) {
VpePlugin.getPluginLog().logError(e);
}
- return false;
+ return hasJsfProjectNatureType;
}
public boolean openBundle(String expression, String locale){
@@ -307,7 +308,7 @@
removeBundle(hashCode, true);
}
- private void addBundle(int hashCode, String prefix, String uri,boolean refresh) {
+ public void addBundle(int hashCode, String prefix, String uri,boolean refresh) {
ResourceBundle bundle = getBundleByUrl(uri, locale);
BundleEntry entry = new BundleEntry(bundle, uri, prefix, hashCode);
if (bundle != null) {
@@ -619,5 +620,5 @@
public BundleEntry[] getBundles() {
return bundles;
}
-
+
}
Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/dialog/ExternalizeStringsWizard.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/dialog/ExternalizeStringsWizard.java 2010-06-16 12:32:25 UTC (rev 22833)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/dialog/ExternalizeStringsWizard.java 2010-06-16 13:23:16 UTC (rev 22834)
@@ -11,6 +11,7 @@
package org.jboss.tools.vpe.editor.dialog;
import java.io.ByteArrayInputStream;
+import java.io.IOException;
import java.io.InputStream;
import org.eclipse.core.resources.IFile;
@@ -18,36 +19,38 @@
import org.eclipse.jface.viewers.IStructuredSelection;
import org.eclipse.jface.wizard.Wizard;
import org.eclipse.ui.dialogs.WizardNewFileCreationPage;
+import org.eclipse.wst.sse.ui.StructuredTextEditor;
import org.jboss.tools.common.model.ui.ModelUIImages;
-import org.jboss.tools.vpe.editor.VpeController;
+import org.jboss.tools.vpe.editor.bundle.BundleMap;
import org.jboss.tools.vpe.messages.VpeUIMessages;
public class ExternalizeStringsWizard extends Wizard {
- public String ExternalizeStringsWizardPageName = "ExternalizeStringsWizardPage";
- public String NewFileCreationPageName = "NewFileCreationPage";
+ public String ExternalizeStringsWizardPageName = "ExternalizeStringsWizardPage"; //$NON-NLS-1$
+ public String NewFileCreationPageName = "NewFileCreationPage"; //$NON-NLS-1$
- VpeController vpeController = null;
+ StructuredTextEditor editor = null;
+ BundleMap bm = null;
ExternalizeStringsWizardPage page1 = null;
WizardNewFileCreationPage page2 = null;
- public ExternalizeStringsWizard(VpeController vpeController) {
+ public ExternalizeStringsWizard(StructuredTextEditor editor, BundleMap bm) {
super();
setHelpAvailable(false);
- setWindowTitle(VpeUIMessages.EXTRNALIZE_STRINGS_DIALOG_TITLE);
- this.vpeController = vpeController;
+ setWindowTitle(VpeUIMessages.EXTERNALIZE_STRINGS_DIALOG_TITLE);
+ this.editor = editor;
+ this.bm = bm;
}
@Override
public void addPages() {
super.addPages();
page1 = new ExternalizeStringsWizardPage(
- ExternalizeStringsWizardPageName, vpeController);
+ ExternalizeStringsWizardPageName, editor, bm);
page2 = new WizardNewFileCreationPage(NewFileCreationPageName,
- (IStructuredSelection) vpeController
- .getSourceEditor().getSelectionProvider().getSelection());
- page2.setTitle(VpeUIMessages.EXTRNALIZE_STRINGS_DIALOG_TITLE);
- page2.setDescription(VpeUIMessages.EXTRNALIZE_STRINGS_DIALOG_DESCRIPTION);
+ (IStructuredSelection) editor.getSelectionProvider().getSelection());
+ page2.setTitle(VpeUIMessages.EXTERNALIZE_STRINGS_DIALOG_TITLE);
+ page2.setDescription(VpeUIMessages.EXTERNALIZE_STRINGS_DIALOG_DESCRIPTION);
page2.setImageDescriptor(ModelUIImages.getImageDescriptor(ModelUIImages.WIZARD_DEFAULT));
addPage(page1);
addPage(page2);
@@ -80,8 +83,12 @@
InputStream is = new ByteArrayInputStream(page1.getKeyValuePair().getBytes());
try {
bundleFile.appendContents(is, false, true, null);
+ is.close();
+ is = null;
} catch (CoreException e) {
e.printStackTrace();
+ } catch (IOException e) {
+ e.printStackTrace();
}
}
/*
Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/dialog/ExternalizeStringsWizardPage.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/dialog/ExternalizeStringsWizardPage.java 2010-06-16 12:32:25 UTC (rev 22833)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/dialog/ExternalizeStringsWizardPage.java 2010-06-16 13:23:16 UTC (rev 22834)
@@ -14,9 +14,13 @@
import java.io.IOException;
import java.io.InputStreamReader;
import java.util.HashSet;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
import java.util.Set;
import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.IProject;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.Status;
@@ -29,6 +33,7 @@
import org.eclipse.jface.viewers.ColumnWeightData;
import org.eclipse.jface.viewers.ISelection;
import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.jface.viewers.StructuredSelection;
import org.eclipse.jface.viewers.TableLayout;
import org.eclipse.jface.wizard.WizardPage;
import org.eclipse.swt.SWT;
@@ -47,22 +52,37 @@
import org.eclipse.swt.widgets.TableColumn;
import org.eclipse.swt.widgets.TableItem;
import org.eclipse.swt.widgets.Text;
+import org.eclipse.ui.IEditorInput;
+import org.eclipse.ui.IFileEditorInput;
import org.eclipse.ui.texteditor.IDocumentProvider;
import org.eclipse.wst.sse.ui.StructuredTextEditor;
+import org.eclipse.wst.sse.ui.internal.provisional.extensions.ISourceEditingTextTools;
+import org.eclipse.wst.xml.core.internal.document.AttrImpl;
+import org.eclipse.wst.xml.core.internal.document.NodeImpl;
+import org.eclipse.wst.xml.core.internal.document.TextImpl;
+import org.eclipse.wst.xml.ui.internal.provisional.IDOMSourceEditingTextTools;
+import org.jboss.tools.common.model.XModel;
+import org.jboss.tools.common.model.project.IModelNature;
import org.jboss.tools.common.model.ui.ModelUIImages;
+import org.jboss.tools.common.model.util.EclipseResourceUtil;
+import org.jboss.tools.jst.web.project.WebProject;
+import org.jboss.tools.jst.web.project.list.WebPromptingProvider;
import org.jboss.tools.vpe.VpePlugin;
-import org.jboss.tools.vpe.editor.VpeController;
import org.jboss.tools.vpe.editor.bundle.BundleMap;
import org.jboss.tools.vpe.editor.bundle.BundleMap.BundleEntry;
import org.jboss.tools.vpe.editor.util.Constants;
import org.jboss.tools.vpe.messages.VpeUIMessages;
import org.w3c.dom.Attr;
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
public class ExternalizeStringsWizardPage extends WizardPage {
private final int DIALOG_WIDTH = 450;
private final int DIALOG_HEIGHT = 650;
- private VpeController vpeController;
+ private StructuredTextEditor editor;
private Text propsKey;
private Text propsValue;
private Button newFile;
@@ -78,17 +98,25 @@
private Table tagsTable;
- public ExternalizeStringsWizardPage(String pageName, VpeController vpeController) {
+ public ExternalizeStringsWizardPage(String pageName, StructuredTextEditor editor, BundleMap bm) {
/*
* Setting dialog Title, Description, Image.
*/
super(pageName,
- VpeUIMessages.EXTRNALIZE_STRINGS_DIALOG_TITLE,
+ VpeUIMessages.EXTERNALIZE_STRINGS_DIALOG_TITLE,
ModelUIImages.getImageDescriptor(ModelUIImages.WIZARD_DEFAULT));
- setDescription(VpeUIMessages.EXTRNALIZE_STRINGS_DIALOG_DESCRIPTION);
+ setDescription(VpeUIMessages.EXTERNALIZE_STRINGS_DIALOG_DESCRIPTION);
setPageComplete(false);
- this.vpeController = vpeController;
- this.bm = vpeController.getPageContext().getBundle();
+ this.editor = editor;
+ if (bm != null) {
+ this.bm = bm;
+ } else {
+ /*
+ * When BundleMap is null create it manually
+ * with all necessary initialization
+ */
+ this.bm = createBundleMap(editor);
+ }
propsKeyStatus = new Status(IStatus.OK, VpePlugin.PLUGIN_ID, Constants.EMPTY);
propsValueStatus = new Status(IStatus.OK, VpePlugin.PLUGIN_ID, Constants.EMPTY);
rbComboStatus = new Status(IStatus.OK, VpePlugin.PLUGIN_ID, Constants.EMPTY);
@@ -114,34 +142,20 @@
Group propsStringGroup = new Group(composite, SWT.SHADOW_ETCHED_IN);
propsStringGroup.setLayout(new GridLayout(3, false));
propsStringGroup.setLayoutData(new GridData(SWT.FILL, SWT.NONE, true, false, 1, 1));
- propsStringGroup.setText(VpeUIMessages.EXTRNALIZE_STRINGS_DIALOG_PROPS_STRINGS_GROUP);
-
-// /*
-// * Create Text String label
-// */
-// Label textStringLabel = new Label(propsStringGroup, SWT.NONE);
-// textStringLabel.setLayoutData(new GridData(SWT.RIGHT, SWT.NONE, false, false, 1, 1));
-// textStringLabel.setText(VpeUIMessages.EXTRNALIZE_STRINGS_DIALOG_TEXT_STRING);
-// /*
-// * Create Text String value
-// */
-// textStringValue = new Text(propsStringGroup, SWT.BORDER);
-// textStringValue.setLayoutData(new GridData(SWT.FILL, SWT.NONE, true, false, 2, 1));
-// textStringValue.setText(Constants.EMPTY);
-// textStringValue.setEditable(false);
+ propsStringGroup.setText(VpeUIMessages.EXTERNALIZE_STRINGS_DIALOG_PROPS_STRINGS_GROUP);
/*
* Create Properties Key label
*/
Label propsKeyLabel = new Label(propsStringGroup, SWT.NONE);
propsKeyLabel.setLayoutData(new GridData(SWT.RIGHT, SWT.NONE, false, false, 1, 1));
- propsKeyLabel.setText(VpeUIMessages.EXTRNALIZE_STRINGS_DIALOG_PROPERTIES_KEY);
+ propsKeyLabel.setText(VpeUIMessages.EXTERNALIZE_STRINGS_DIALOG_PROPERTIES_KEY);
/*
* Create Properties Key value
*/
propsKey = new Text(propsStringGroup, SWT.BORDER);
propsKey.setLayoutData(new GridData(SWT.FILL, SWT.NONE, true, false, 2, 1));
- propsKey.setText(VpeUIMessages.EXTRNALIZE_STRINGS_DIALOG_DEFAULT_KEY);
+ propsKey.setText(VpeUIMessages.EXTERNALIZE_STRINGS_DIALOG_DEFAULT_KEY);
propsKey.addModifyListener(new ModifyListener() {
public void modifyText(ModifyEvent e) {
updateStatus();
@@ -152,7 +166,7 @@
*/
Label propsValueLabel = new Label(propsStringGroup, SWT.NONE);
propsValueLabel.setLayoutData(new GridData(SWT.RIGHT, SWT.NONE, false, false, 1, 1));
- propsValueLabel.setText(VpeUIMessages.EXTRNALIZE_STRINGS_DIALOG_PROPERTIES_VALUE);
+ propsValueLabel.setText(VpeUIMessages.EXTERNALIZE_STRINGS_DIALOG_PROPERTIES_VALUE);
/*
* Create Properties Value value
*/
@@ -171,7 +185,7 @@
*/
newFile = new Button(composite, SWT.CHECK);
newFile.setLayoutData(new GridData(SWT.LEFT, SWT.NONE, false, false, 1, 1));
- newFile.setText(VpeUIMessages.EXTRNALIZE_STRINGS_DIALOG_NEW_FILE);
+ newFile.setText(VpeUIMessages.EXTERNALIZE_STRINGS_DIALOG_NEW_FILE);
/*
* Create properties string group
@@ -181,7 +195,7 @@
gd = new GridData(SWT.FILL, SWT.FILL, true, false, 1, 1);
gd.heightHint = 300;
propsFilesGroup.setLayoutData(gd);
- propsFilesGroup.setText(VpeUIMessages.EXTRNALIZE_STRINGS_DIALOG_PROPS_FILES_GROUP);
+ propsFilesGroup.setText(VpeUIMessages.EXTERNALIZE_STRINGS_DIALOG_PROPS_FILES_GROUP);
/*
* Add selection listener to New File button
@@ -204,7 +218,7 @@
*/
rbListLabel = new Label(propsFilesGroup, SWT.NONE);
rbListLabel.setLayoutData(new GridData(SWT.RIGHT, SWT.NONE, false, false, 1, 1));
- rbListLabel.setText(VpeUIMessages.EXTRNALIZE_STRINGS_DIALOG_RESOURCE_BUNDLE_LIST);
+ rbListLabel.setText(VpeUIMessages.EXTERNALIZE_STRINGS_DIALOG_RESOURCE_BUNDLE_LIST);
/*
* Create Resource Bundles combobox
*/
@@ -235,7 +249,7 @@
*/
propsFileLabel = new Label(propsFilesGroup, SWT.NONE);
propsFileLabel.setLayoutData(new GridData(SWT.RIGHT, SWT.NONE, false,false, 1, 1));
- propsFileLabel.setText(VpeUIMessages.EXTRNALIZE_STRINGS_DIALOG_PROPERTIES_FILE);
+ propsFileLabel.setText(VpeUIMessages.EXTERNALIZE_STRINGS_DIALOG_PROPERTIES_FILE);
/*
* Create Properties File path field
*/
@@ -255,11 +269,11 @@
ColumnLayoutData columnLayoutData;
TableColumn propNameColumn = new TableColumn(tagsTable, SWT.NONE);
- propNameColumn.setText(VpeUIMessages.EXTRNALIZE_STRINGS_DIALOG_PROPERTY_NAME);
+ propNameColumn.setText(VpeUIMessages.EXTERNALIZE_STRINGS_DIALOG_PROPERTY_NAME);
columnLayoutData = new ColumnWeightData(200, true);
layout.addColumnData(columnLayoutData);
TableColumn propValueColumn = new TableColumn(tagsTable, SWT.NONE);
- propValueColumn.setText(VpeUIMessages.EXTRNALIZE_STRINGS_DIALOG_PROPERTY_VALUE);
+ propValueColumn.setText(VpeUIMessages.EXTERNALIZE_STRINGS_DIALOG_PROPERTY_VALUE);
columnLayoutData = new ColumnWeightData(200, true);
layout.addColumnData(columnLayoutData);
@@ -275,54 +289,47 @@
}
private void initializeTextFields() {
- if ((vpeController == null) || (bm == null)){
+ if (bm == null){
VpePlugin.getDefault().logWarning(
- VpeUIMessages.EXTRNALIZE_STRINGS_DIALOG_INITIALIZATION_ERROR);
+ VpeUIMessages.EXTERNALIZE_STRINGS_DIALOG_INITIALIZATION_ERROR);
} else {
- ISelection sel = vpeController.getSourceEditor().getSelectionProvider().getSelection();
+ ISelection sel = editor.getSelectionProvider().getSelection();
if ((propsValue != null) && (propsKey != null)
&& isSelectionCorrect(sel)) {
- /*
- * TODO: One must add functionality
- * for convenient text replacement
- */
+ String text = Constants.EMPTY;
String stringToUpdate = Constants.EMPTY;
TextSelection textSelection = null;
- String text = null;
IStructuredSelection structuredSelection = (IStructuredSelection) sel;
textSelection = (TextSelection) sel;
text = textSelection.getText();
- /*
- * Update text string field
- */
- propsValue.setText(text);
- /*
- * Update status message.
- */
- updateStatus();
-
Object selectedElement = structuredSelection.getFirstElement();
/*
- * Parse selected element and find a string to replace
+ * When selected text in empty
+ * parse selected element and find a string to replace.
*/
- if (selectedElement instanceof org.w3c.dom.Text) {
- org.w3c.dom.Text textNode = (org.w3c.dom.Text) selectedElement;
- if ((textNode.getNodeValue().trim().length() > 0)
- && (text.trim().length() > 0)) {
- stringToUpdate = textNode.getNodeValue();
+ if ((text.trim().length() == 0)) {
+ if (selectedElement instanceof org.w3c.dom.Text) {
+ org.w3c.dom.Text textNode = (org.w3c.dom.Text) selectedElement;
+ if (textNode.getNodeValue().trim().length() > 0) {
+ stringToUpdate = textNode.getNodeValue();
+ editor.getSelectionProvider().setSelection(new StructuredSelection(stringToUpdate));
+ }
+ } else if (selectedElement instanceof Attr) {
+ Attr attrNode = (Attr) selectedElement;
+ if (attrNode.getNodeValue().trim().length() > 0) {
+ stringToUpdate = attrNode.getNodeValue();
+ editor.getSelectionProvider().setSelection(new StructuredSelection(stringToUpdate));
+ }
}
- } else if (selectedElement instanceof Attr) {
- Attr attrNode = (Attr) selectedElement;
- if ((attrNode.getNodeValue().trim().length() > 0)
- && (text.trim().length() > 0)) {
- stringToUpdate = attrNode.getNodeValue();
+ if ((stringToUpdate.trim().length() > 0)) {
+ text = stringToUpdate;
}
- } else {
- VpePlugin.getDefault().logWarning(
- VpeUIMessages.EXTRNALIZE_STRINGS_DIALOG_INITIALIZATION_ERROR);
}
-
/*
+ * Update text string field
+ */
+ propsValue.setText(text.trim());
+ /*
* Initialize bundle messages field
*/
BundleEntry[] bundles = bm.getBundles();
@@ -333,9 +340,13 @@
rbCombo.add(bundleEntry.uri);
}
}
+ /*
+ * Update status message.
+ */
+ updateStatus();
} else {
VpePlugin.getDefault().logWarning(
- VpeUIMessages.EXTRNALIZE_STRINGS_DIALOG_INITIALIZATION_ERROR);
+ VpeUIMessages.EXTERNALIZE_STRINGS_DIALOG_INITIALIZATION_ERROR);
}
}
}
@@ -429,7 +440,6 @@
}
public boolean replaceText() {
- StructuredTextEditor editor = vpeController.getSourceEditor();
IDocumentProvider prov = editor.getDocumentProvider();
IDocument doc = prov.getDocument(editor.getEditorInput());
ISelection sel = editor.getSelectionProvider().getSelection();
@@ -438,7 +448,26 @@
/*
* Get source text and new text
*/
- final TextSelection textSel = (TextSelection) sel;
+ TextSelection textSel = (TextSelection) sel;
+ IStructuredSelection structuredSelection = (IStructuredSelection) sel;
+ Object firstElement = structuredSelection.getFirstElement();
+ int offset = 0;
+ int length = 0;
+ if ((textSel.getLength() != 0)) {
+ offset = textSel.getOffset();
+ length = textSel.getLength();
+ } else if (firstElement instanceof TextImpl) {
+ TextImpl ti = (TextImpl) firstElement;
+ offset = ti.getStartOffset();
+ length = ti.getLength();
+ } else if (firstElement instanceof AttrImpl) {
+ AttrImpl ai = (AttrImpl) firstElement;
+ /*
+ * Get offset and length without quotes ".."
+ */
+ offset = ai.getValueRegionStartOffset() + 1;
+ length = ai.getValueRegionText().length() - 2;
+ }
/*
* Replace text in the editor with "key.value"
*/
@@ -451,7 +480,7 @@
}
}
String newText = "#{" + bundlePrefix + Constants.DOT + propsKey.getText() + "}"; //$NON-NLS-1$ //$NON-NLS-2$
- doc.replace(textSel.getOffset(), textSel.getLength(), newText);
+ doc.replace(offset, length, newText);
} catch (BadLocationException ex) {
ex.printStackTrace();
}
@@ -464,7 +493,7 @@
rbComboStatus = new Status(
IStatus.ERROR,
VpePlugin.PLUGIN_ID,
- VpeUIMessages.EXTRNALIZE_STRINGS_DIALOG_KEY_ALREADY_EXISTS);
+ VpeUIMessages.EXTERNALIZE_STRINGS_DIALOG_KEY_ALREADY_EXISTS);
} else {
rbComboStatus = new Status(IStatus.OK, VpePlugin.PLUGIN_ID, Constants.EMPTY);
}
@@ -479,7 +508,7 @@
propsValueStatus = new Status(
IStatus.ERROR,
VpePlugin.PLUGIN_ID,
- VpeUIMessages.EXTRNALIZE_STRINGS_DIALOG_WRONG_SELECTED_TEXT);
+ VpeUIMessages.EXTERNALIZE_STRINGS_DIALOG_WRONG_SELECTED_TEXT);
} else {
propsValueStatus = new Status(IStatus.OK, VpePlugin.PLUGIN_ID, Constants.EMPTY);
}
@@ -491,7 +520,7 @@
propsKeyStatus = new Status(
IStatus.ERROR,
VpePlugin.PLUGIN_ID,
- VpeUIMessages.EXTRNALIZE_STRINGS_DIALOG_KEY_MUST_BE_SET);
+ VpeUIMessages.EXTERNALIZE_STRINGS_DIALOG_KEY_MUST_BE_SET);
} else {
propsKeyStatus = new Status(IStatus.OK, VpePlugin.PLUGIN_ID, Constants.EMPTY);
}
@@ -570,5 +599,77 @@
&& (newFile.getSelection() == true);
}
+ private BundleMap createBundleMap(StructuredTextEditor editor) {
+ String uri = null;
+ String prefix = null;
+ int hash;
+ Map<?, ?> map = null;
+ BundleMap bm = new BundleMap();
+ bm.init(editor);
+
+ /*
+ * Check JSF Nature
+ */
+ boolean hasJsfProjectNatureType = false;
+ try {
+ IEditorInput ei = editor.getEditorInput();
+ if(ei instanceof IFileEditorInput) {
+ IProject project = ((IFileEditorInput)ei).getFile().getProject();
+ if (project.exists() && project.isOpen()) {
+ if (project.hasNature(WebProject.JSF_NATURE_ID)) {
+ hasJsfProjectNatureType = true;
+ }
+ }
+ }
+ } catch (CoreException e) {
+ VpePlugin.getPluginLog().logError(e);
+ }
+
+ /*
+ * Get Bundles from faces-config.xml
+ */
+ if (hasJsfProjectNatureType
+ && (editor.getEditorInput() instanceof IFileEditorInput)) {
+ IProject project = ((IFileEditorInput) editor.getEditorInput())
+ .getFile().getProject();
+ IModelNature modelNature = EclipseResourceUtil.getModelNature(project);
+ if (modelNature != null) {
+ XModel model = modelNature.getModel();
+ List<Object> l = WebPromptingProvider.getInstance().getList(model,
+ WebPromptingProvider.JSF_REGISTERED_BUNDLES, null, null);
+ if (l != null && l.size() > 1 && (l.get(1) instanceof Map)) {
+ map = (Map<?, ?>) l.get(1);
+ if ((null != map) && (map.keySet().size() > 0)) {
+ Iterator<?> it = map.keySet().iterator();
+ while (it.hasNext()) {
+ uri = it.next().toString();
+ prefix = map.get(uri).toString();
+ hash = (prefix + ":" + uri).hashCode(); //$NON-NLS-1$
+ bm.addBundle(hash, prefix, uri, false);
+ }
+ }
+ }
+ }
+ }
+
+ /*
+ * Add bundles from <f:loadBundle> tags
+ */
+ ISourceEditingTextTools sourceEditingTextTools =
+ (ISourceEditingTextTools) editor
+ .getAdapter(ISourceEditingTextTools.class);
+ IDOMSourceEditingTextTools domSourceEditingTextTools =
+ (IDOMSourceEditingTextTools) sourceEditingTextTools;
+ Document doc = domSourceEditingTextTools.getDOMDocument();
+ NodeList list = doc.getElementsByTagName("f:loadBundle"); //$NON-NLS-1$
+ for (int i = 0; i < list.getLength(); i++) {
+ Element node = (Element) list.item(i);
+ uri = node.getAttribute("basename"); //$NON-NLS-1$
+ prefix = node.getAttribute("var"); //$NON-NLS-1$
+ hash = node.hashCode();
+ bm.addBundle(hash, prefix, uri, false);
+ }
+ return bm;
+ }
}
Added: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/menu/ExternalizeStringsContributionItem.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/menu/ExternalizeStringsContributionItem.java (rev 0)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/menu/ExternalizeStringsContributionItem.java 2010-06-16 13:23:16 UTC (rev 22834)
@@ -0,0 +1,30 @@
+/*******************************************************************************
+ * Copyright (c) 2007-2010 Exadel, Inc. and Red Hat, Inc.
+ * Distributed under license by Red Hat, Inc. All rights reserved.
+ * This program is made available under the terms of the
+ * Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Exadel, Inc. and Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
+package org.jboss.tools.vpe.editor.menu;
+
+import org.eclipse.jface.action.ActionContributionItem;
+import org.eclipse.swt.widgets.Menu;
+import org.jboss.tools.vpe.editor.menu.action.ExternalizeStringsAction;
+import org.jboss.tools.vpe.messages.VpeUIMessages;
+
+public class ExternalizeStringsContributionItem extends ActionContributionItem {
+
+ public ExternalizeStringsContributionItem() {
+ super(new ExternalizeStringsAction());
+ }
+
+ @Override
+ public void fill(Menu parent, int index) {
+ getAction().setText(VpeUIMessages.EXTERNALIZE_STRINGS);
+ super.fill(parent, index);
+ }
+
+}
Added: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/menu/action/ExternalizeStringsAction.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/menu/action/ExternalizeStringsAction.java (rev 0)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/menu/action/ExternalizeStringsAction.java 2010-06-16 13:23:16 UTC (rev 22834)
@@ -0,0 +1,53 @@
+/*******************************************************************************
+ * Copyright (c) 2007-2010 Exadel, Inc. and Red Hat, Inc.
+ * Distributed under license by Red Hat, Inc. All rights reserved.
+ * This program is made available under the terms of the
+ * Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Exadel, Inc. and Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
+package org.jboss.tools.vpe.editor.menu.action;
+
+import org.eclipse.jface.action.Action;
+import org.eclipse.jface.dialogs.MessageDialog;
+import org.eclipse.jface.text.TextSelection;
+import org.eclipse.jface.viewers.ISelection;
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.ui.PlatformUI;
+import org.jboss.tools.jst.jsp.jspeditor.JSPMultiPageEditor;
+import org.jboss.tools.vpe.editor.dialog.ExternalizeStringsDialog;
+import org.jboss.tools.vpe.editor.dialog.ExternalizeStringsWizard;
+import org.jboss.tools.vpe.messages.VpeUIMessages;
+
+public class ExternalizeStringsAction extends Action {
+
+ private JSPMultiPageEditor editor;
+
+ public ExternalizeStringsAction() {
+ super();
+ editor = (JSPMultiPageEditor) PlatformUI.getWorkbench()
+ .getActiveWorkbenchWindow().getActivePage().getActiveEditor();
+ }
+
+ @Override
+ public void run() {
+ ISelection sel = editor.getSelectionProvider().getSelection();
+
+ if ((sel instanceof TextSelection)
+ && (sel instanceof IStructuredSelection)
+ && (((IStructuredSelection) sel).size() == 1)) {
+ ExternalizeStringsDialog dlg = new ExternalizeStringsDialog(
+ PlatformUI.getWorkbench().getDisplay().getActiveShell(),
+ new ExternalizeStringsWizard(editor.getSourceEditor(), null));
+ dlg.open();
+ } else {
+ MessageDialog.openWarning(
+ PlatformUI.getWorkbench().getDisplay().getActiveShell(),
+ VpeUIMessages.EXTERNALIZE_STRINGS_DIALOG_TITLE,
+ VpeUIMessages.EXTERNALIZE_STRINGS_DIALOG_WRONG_SELECTION);
+ }
+ }
+
+}
Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/mozilla/MozillaEditor.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/mozilla/MozillaEditor.java 2010-06-16 12:32:25 UTC (rev 22833)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/mozilla/MozillaEditor.java 2010-06-16 13:23:16 UTC (rev 22834)
@@ -25,6 +25,8 @@
import java.util.Map;
import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IPath;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.IStatus;
@@ -34,6 +36,7 @@
import org.eclipse.jface.action.ToolBarManager;
import org.eclipse.jface.dialogs.MessageDialog;
import org.eclipse.jface.resource.ImageDescriptor;
+import org.eclipse.jface.text.IDocument;
import org.eclipse.jface.text.TextSelection;
import org.eclipse.jface.viewers.ISelection;
import org.eclipse.jface.viewers.IStructuredSelection;
@@ -63,6 +66,7 @@
import org.eclipse.ui.editors.text.ILocationProvider;
import org.eclipse.ui.internal.part.StatusPart;
import org.eclipse.ui.part.EditorPart;
+import org.eclipse.wst.sse.ui.StructuredTextEditor;
import org.jboss.tools.jst.jsp.JspEditorPlugin;
import org.jboss.tools.jst.jsp.preferences.IVpePreferencesPage;
import org.jboss.tools.vpe.VpePlugin;
@@ -469,7 +473,7 @@
/*
* Create EXTERNALIZE STRINGS tool bar item
*/
- externalizeStringsAction = new Action(VpeUIMessages.EXTENALIZE_STRINGS,
+ externalizeStringsAction = new Action(VpeUIMessages.EXTERNALIZE_STRINGS,
IAction.AS_PUSH_BUTTON) {
@Override
public void run() {
@@ -479,27 +483,29 @@
* When selection is correct show the dialog
* otherwise show warning message.
*/
- ISelection sel = controller.getSourceEditor().getSelectionProvider().getSelection();
+ StructuredTextEditor editor = controller.getSourceEditor();
+ ISelection sel = editor.getSelectionProvider().getSelection();
if ((sel instanceof TextSelection)
&& (sel instanceof IStructuredSelection)
&& (((IStructuredSelection) sel).size() == 1)) {
ExternalizeStringsDialog dlg = new ExternalizeStringsDialog(
PlatformUI.getWorkbench().getDisplay().getActiveShell(),
- new ExternalizeStringsWizard(controller));
+ new ExternalizeStringsWizard(
+ editor, controller.getPageContext().getBundle()));
dlg.open();
} else {
MessageDialog.openWarning(
PlatformUI.getWorkbench().getDisplay().getActiveShell(),
- VpeUIMessages.EXTRNALIZE_STRINGS_DIALOG_TITLE,
- VpeUIMessages.EXTRNALIZE_STRINGS_DIALOG_WRONG_SELECTION);
+ VpeUIMessages.EXTERNALIZE_STRINGS_DIALOG_TITLE,
+ VpeUIMessages.EXTERNALIZE_STRINGS_DIALOG_WRONG_SELECTION);
}
}
};
externalizeStringsAction.setImageDescriptor(ImageDescriptor.createFromFile(MozillaEditor.class,
ICON_EXTERNALIZE_STRINGS));
- externalizeStringsAction.setToolTipText(VpeUIMessages.EXTENALIZE_STRINGS);
+ externalizeStringsAction.setToolTipText(VpeUIMessages.EXTERNALIZE_STRINGS);
toolBarManager.add(externalizeStringsAction);
updateToolbarItemsAccordingToPreferences();
Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/messages/VpeUIMessages.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/messages/VpeUIMessages.java 2010-06-16 12:32:25 UTC (rev 22833)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/messages/VpeUIMessages.java 2010-06-16 13:23:16 UTC (rev 22834)
@@ -127,7 +127,7 @@
public static String SHOW_RESOURCE_BUNDLES_USAGE_AS_EL;
public static String SHOW_BUNDLES_AS_EL;
public static String SHOW_BUNDLES_AS_MESSAGES;
- public static String EXTENALIZE_STRINGS;
+ public static String EXTERNALIZE_STRINGS;
public static String ASK_TAG_ATTRIBUTES_ON_TAG_INSERT;
public static String ASK_CONFIRMATION_ON_CLOSING_SELECTION_BAR;
public static String INFORM_WHEN_PROJECT_MIGHT_NOT_BE_CONFIGURED_PROPERLY_FOR_VPE;
@@ -158,28 +158,28 @@
public static String COULD_NOT_SET_TABLE_SELECTION;
public static String CANNOT_LOAD_TAGLIBS_FROM_PAGE_CONTEXT;
public static String LIST_IS_EMPTY;
- public static String EXTRNALIZE_STRINGS_DIALOG_TITLE;
- public static String EXTRNALIZE_STRINGS_DIALOG_DESCRIPTION;
- public static String EXTRNALIZE_STRINGS_DIALOG_TEXT_STRING;
- public static String EXTRNALIZE_STRINGS_DIALOG_PROPERTIES_KEY;
- public static String EXTRNALIZE_STRINGS_DIALOG_PROPERTIES_VALUE;
- public static String EXTRNALIZE_STRINGS_DIALOG_PROPERTIES_FILE;
- public static String EXTRNALIZE_STRINGS_DIALOG_RESOURCE_BUNDLE_LIST;
- public static String EXTRNALIZE_STRINGS_DIALOG_PROPS_STRINGS_GROUP;
- public static String EXTRNALIZE_STRINGS_DIALOG_PROPS_FILES_GROUP;
- public static String EXTRNALIZE_STRINGS_DIALOG_INITIALIZATION_ERROR;
- public static String EXTRNALIZE_STRINGS_DIALOG_WRONG_SELECTION;
- public static String EXTRNALIZE_STRINGS_DIALOG_WRONG_SELECTED_TEXT;
- public static String EXTRNALIZE_STRINGS_DIALOG_PLEASE_SELECT_BUNDLE;
- public static String EXTRNALIZE_STRINGS_DIALOG_SELECTED_TEXT_IS_EMPTY;
- public static String EXTRNALIZE_STRINGS_DIALOG_KEY_MUST_BE_SET;
- public static String EXTRNALIZE_STRINGS_DIALOG_VALUE_MUST_BE_SET;
- public static String EXTRNALIZE_STRINGS_DIALOG_NEW_FILE;
- public static String EXTRNALIZE_STRINGS_DIALOG_DEFAULT_KEY;
- public static String EXTRNALIZE_STRINGS_DIALOG_DEFAULT_VALUE;
- public static String EXTRNALIZE_STRINGS_DIALOG_PROPERTY_NAME;
- public static String EXTRNALIZE_STRINGS_DIALOG_PROPERTY_VALUE;
- public static String EXTRNALIZE_STRINGS_DIALOG_KEY_ALREADY_EXISTS;
+ public static String EXTERNALIZE_STRINGS_DIALOG_TITLE;
+ public static String EXTERNALIZE_STRINGS_DIALOG_DESCRIPTION;
+ public static String EXTERNALIZE_STRINGS_DIALOG_TEXT_STRING;
+ public static String EXTERNALIZE_STRINGS_DIALOG_PROPERTIES_KEY;
+ public static String EXTERNALIZE_STRINGS_DIALOG_PROPERTIES_VALUE;
+ public static String EXTERNALIZE_STRINGS_DIALOG_PROPERTIES_FILE;
+ public static String EXTERNALIZE_STRINGS_DIALOG_RESOURCE_BUNDLE_LIST;
+ public static String EXTERNALIZE_STRINGS_DIALOG_PROPS_STRINGS_GROUP;
+ public static String EXTERNALIZE_STRINGS_DIALOG_PROPS_FILES_GROUP;
+ public static String EXTERNALIZE_STRINGS_DIALOG_INITIALIZATION_ERROR;
+ public static String EXTERNALIZE_STRINGS_DIALOG_WRONG_SELECTION;
+ public static String EXTERNALIZE_STRINGS_DIALOG_WRONG_SELECTED_TEXT;
+ public static String EXTERNALIZE_STRINGS_DIALOG_PLEASE_SELECT_BUNDLE;
+ public static String EXTERNALIZE_STRINGS_DIALOG_SELECTED_TEXT_IS_EMPTY;
+ public static String EXTERNALIZE_STRINGS_DIALOG_KEY_MUST_BE_SET;
+ public static String EXTERNALIZE_STRINGS_DIALOG_VALUE_MUST_BE_SET;
+ public static String EXTERNALIZE_STRINGS_DIALOG_NEW_FILE;
+ public static String EXTERNALIZE_STRINGS_DIALOG_DEFAULT_KEY;
+ public static String EXTERNALIZE_STRINGS_DIALOG_DEFAULT_VALUE;
+ public static String EXTERNALIZE_STRINGS_DIALOG_PROPERTY_NAME;
+ public static String EXTERNALIZE_STRINGS_DIALOG_PROPERTY_VALUE;
+ public static String EXTERNALIZE_STRINGS_DIALOG_KEY_ALREADY_EXISTS;
public static String COULD_NOT_OPEN_VPE_RESOURCES_DIALOG;
Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/messages/messages.properties
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/messages/messages.properties 2010-06-16 12:32:25 UTC (rev 22833)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/messages/messages.properties 2010-06-16 13:23:16 UTC (rev 22834)
@@ -109,7 +109,7 @@
HIDE_TEXT_FORMATTING = Hide text formatting bar
SHOW_RESOURCE_BUNDLES_USAGE_AS_EL=Show resource bundles usage as EL expressions
SHOW_BUNDLES_AS_EL=Show bundle's messages as EL expressions
-EXTENALIZE_STRINGS=Externalize strings
+EXTERNALIZE_STRINGS=Externalize strings
SHOW_BUNDLES_AS_MESSAGES=Show bundle's messages explicitly
ASK_TAG_ATTRIBUTES_ON_TAG_INSERT=Ask for tag attributes during tag insert
ASK_CONFIRMATION_ON_CLOSING_SELECTION_BAR=Ask for confirmation when closing Selection Bar
@@ -146,28 +146,28 @@
LIST_IS_EMPTY=List is empty
# Externalize Strings Dialog
-EXTRNALIZE_STRINGS_DIALOG_TITLE=Externalize Strings Dialog
-EXTRNALIZE_STRINGS_DIALOG_DESCRIPTION=Externalize your strings via properties file
-EXTRNALIZE_STRINGS_DIALOG_TEXT_STRING=Text string:
-EXTRNALIZE_STRINGS_DIALOG_PROPERTIES_KEY=Properties key:
-EXTRNALIZE_STRINGS_DIALOG_PROPERTIES_VALUE=Properties value:
-EXTRNALIZE_STRINGS_DIALOG_PROPERTIES_FILE=Properties file:
-EXTRNALIZE_STRINGS_DIALOG_RESOURCE_BUNDLE_LIST=Select resource bundle:
-EXTRNALIZE_STRINGS_DIALOG_PROPS_STRINGS_GROUP=Externalize strings
-EXTRNALIZE_STRINGS_DIALOG_PROPS_FILES_GROUP=Handle properties file
-EXTRNALIZE_STRINGS_DIALOG_INITIALIZATION_ERROR=Could not initialize externalization dialog!
-EXTRNALIZE_STRINGS_DIALOG_WRONG_SELECTION=Wrong selection! Please select correct string.
-EXTRNALIZE_STRINGS_DIALOG_WRONG_SELECTED_TEXT=Wrong selected text. Please select correct string.
-EXTRNALIZE_STRINGS_DIALOG_PLEASE_SELECT_BUNDLE=- Please select bundle -
-EXTRNALIZE_STRINGS_DIALOG_SELECTED_TEXT_IS_EMPTY=Selected text is empty
-EXTRNALIZE_STRINGS_DIALOG_KEY_MUST_BE_SET=Key must be set
-EXTRNALIZE_STRINGS_DIALOG_VALUE_MUST_BE_SET=Value must be set
-EXTRNALIZE_STRINGS_DIALOG_NEW_FILE=Create a new properties file (See details on the next page)
-EXTRNALIZE_STRINGS_DIALOG_DEFAULT_KEY=key
-EXTRNALIZE_STRINGS_DIALOG_DEFAULT_VALUE=value
-EXTRNALIZE_STRINGS_DIALOG_PROPERTY_NAME=Property name
-EXTRNALIZE_STRINGS_DIALOG_PROPERTY_VALUE=Property value
-EXTRNALIZE_STRINGS_DIALOG_KEY_ALREADY_EXISTS=Such a key already exists
+EXTERNALIZE_STRINGS_DIALOG_TITLE=Externalize Strings Dialog
+EXTERNALIZE_STRINGS_DIALOG_DESCRIPTION=Externalize your strings via properties file
+EXTERNALIZE_STRINGS_DIALOG_TEXT_STRING=Text string:
+EXTERNALIZE_STRINGS_DIALOG_PROPERTIES_KEY=Properties key:
+EXTERNALIZE_STRINGS_DIALOG_PROPERTIES_VALUE=Properties value:
+EXTERNALIZE_STRINGS_DIALOG_PROPERTIES_FILE=Properties file:
+EXTERNALIZE_STRINGS_DIALOG_RESOURCE_BUNDLE_LIST=Select resource bundle:
+EXTERNALIZE_STRINGS_DIALOG_PROPS_STRINGS_GROUP=Externalize strings
+EXTERNALIZE_STRINGS_DIALOG_PROPS_FILES_GROUP=Handle properties file
+EXTERNALIZE_STRINGS_DIALOG_INITIALIZATION_ERROR=Could not initialize externalization dialog!
+EXTERNALIZE_STRINGS_DIALOG_WRONG_SELECTION=Wrong selection! Please select correct string.
+EXTERNALIZE_STRINGS_DIALOG_WRONG_SELECTED_TEXT=Wrong selected text. Please select correct string.
+EXTERNALIZE_STRINGS_DIALOG_PLEASE_SELECT_BUNDLE=- Please select bundle -
+EXTERNALIZE_STRINGS_DIALOG_SELECTED_TEXT_IS_EMPTY=Selected text is empty
+EXTERNALIZE_STRINGS_DIALOG_KEY_MUST_BE_SET=Key must be set
+EXTERNALIZE_STRINGS_DIALOG_VALUE_MUST_BE_SET=Value must be set
+EXTERNALIZE_STRINGS_DIALOG_NEW_FILE=Create a new properties file (See details on the next page)
+EXTERNALIZE_STRINGS_DIALOG_DEFAULT_KEY=key
+EXTERNALIZE_STRINGS_DIALOG_DEFAULT_VALUE=value
+EXTERNALIZE_STRINGS_DIALOG_PROPERTY_NAME=Property name
+EXTERNALIZE_STRINGS_DIALOG_PROPERTY_VALUE=Property value
+EXTERNALIZE_STRINGS_DIALOG_KEY_ALREADY_EXISTS=Such a key already exists
# Other messages
CANNOT_LOAD_TAGLIBS_FROM_PAGE_CONTEXT=Cannot load taglibs from PageContext!
15 years, 10 months
- 1
- 0
JBoss Tools SVN: r22833 - in trunk/cdi: tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt and 3 other directories.
by jbosstools-commits＠lists.jboss.org
Author: akazakov
Date: 2010-06-16 08:32:25 -0400 (Wed, 16 Jun 2010)
New Revision: 22833
Added:
trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/resolution/
trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/resolution/AssignabilityOfRawAndParameterizedTypes.java
Modified:
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/CDICoreValidator.java
trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/AssignabilityOfRawAndParameterizedTypesTest.java
trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/TCKTest.java
trunk/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/ui/test/wizard/NewCDIWizardTest.java
Log:
https://jira.jboss.org/browse/JBIDE-6474
https://jira.jboss.org/browse/JBIDE-5808
New JUnit tests for CDI bean resolution.
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/CDICoreValidator.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/CDICoreValidator.java 2010-06-16 12:23:13 UTC (rev 22832)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/CDICoreValidator.java 2010-06-16 12:32:25 UTC (rev 22833)
@@ -107,19 +107,19 @@
*/
public IValidatingProjectSet getValidatingProjects(IProject project) {
IValidationContext rootContext = null;
- IProject war = null; // TODO get war ?
- if (war != null && war.isAccessible()) {
- IKbProject kbProject = KbProjectFactory.getKbProject(war, false);
- if (kbProject != null) {
- rootContext = kbProject.getValidationContext();
- } else {
- KbProject.checkKBBuilderInstalled(war);
- CDICoreNature cdiProject = CDICorePlugin.getCDI(project, false);
- if (cdiProject != null) {
- rootContext = null; // cdiProject.getDelegate().getValidationContext();
- }
- }
- }
+// IProject war = null; // TODO get war ?
+// if (war != null && war.isAccessible()) {
+// IKbProject kbProject = KbProjectFactory.getKbProject(war, false);
+// if (kbProject != null) {
+// rootContext = kbProject.getValidationContext();
+// } else {
+// KbProject.checkKBBuilderInstalled(war);
+// CDICoreNature cdiProject = CDICorePlugin.getCDI(project, false);
+// if (cdiProject != null) {
+// rootContext = null; // cdiProject.getDelegate().getValidationContext();
+// }
+// }
+// }
if (rootContext == null) {
CDICoreNature cdiProject = CDICorePlugin.getCDI(project, false);
if (cdiProject != null) {
Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/resolution/AssignabilityOfRawAndParameterizedTypes.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/resolution/AssignabilityOfRawAndParameterizedTypes.java (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/resolution/AssignabilityOfRawAndParameterizedTypes.java 2010-06-16 12:32:25 UTC (rev 22833)
@@ -0,0 +1,16 @@
+package org.jboss.jsr299.tck.tests.jbt.resolution;
+
+import javax.inject.Inject;
+
+import org.jboss.jsr299.tck.tests.lookup.typesafe.resolution.parameterized.Result;
+
+public class AssignabilityOfRawAndParameterizedTypes<T1 extends Exception, T2 extends Exception> {
+
+ private @Inject Result<? extends Throwable, ? super Exception> injection;
+
+ private @Inject Result<? extends Exception, ? super Exception> injection2;
+
+ private @Inject Result<Exception, Exception> injection3;
+
+ private @Inject Result<T1, T2> injection4;
+}
Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/resolution/AssignabilityOfRawAndParameterizedTypes.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Modified: trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/AssignabilityOfRawAndParameterizedTypesTest.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/AssignabilityOfRawAndParameterizedTypesTest.java 2010-06-16 12:23:13 UTC (rev 22832)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/AssignabilityOfRawAndParameterizedTypesTest.java 2010-06-16 12:32:25 UTC (rev 22833)
@@ -13,7 +13,13 @@
import java.util.Set;
import org.eclipse.core.runtime.CoreException;
+import org.eclipse.jdt.core.IType;
import org.jboss.tools.cdi.core.IBean;
+import org.jboss.tools.cdi.core.IInjectionPointField;
+import org.jboss.tools.cdi.core.IParametedType;
+import org.jboss.tools.cdi.core.IQualifierDeclaration;
+import org.jboss.tools.common.EclipseUtil;
+import org.jboss.tools.common.model.util.EclipseJavaUtil;
/**
* @author Alexey Kazakov
@@ -31,5 +37,91 @@
assertEquals("Wrong number of the beans", 4, beans.size());
}
- // TODO continue implementing tests.
+ /**
+ * Section 5.2.3 - Assignability of raw and parameterized types
+ * ba) Check the required type parameter and the bean type parameter are actual types with identical raw type
+ *
+ * @throws CoreException
+ */
+ public void testAssignabilityOfParameterizedTypeWithActualTypesToParameterizedTypeWithActualTypes() throws CoreException {
+ IType type = EclipseJavaUtil.findType(EclipseUtil.getJavaProject(cdiProject.getNature().getProject()), "org.jboss.jsr299.tck.tests.lookup.typesafe.resolution.parameterized.MapProducer");
+ IParametedType parametedType = cdiProject.getNature().getTypeFactory().getParametedType(type, "QMap<QInteger;>;");
+ Set<IBean> beans = cdiProject.getBeans(true, parametedType, new IQualifierDeclaration[0]);
+ assertEquals("Wrong number of the beans", 2, beans.size());
+
+ type = EclipseJavaUtil.findType(EclipseUtil.getJavaProject(cdiProject.getNature().getProject()), "org.jboss.jsr299.tck.tests.lookup.typesafe.resolution.parameterized.IntegerHashMap");
+ parametedType = cdiProject.getNature().getTypeFactory().getParametedType(type, "QHashMap<QInteger;>;");
+ beans = cdiProject.getBeans(true, parametedType, new IQualifierDeclaration[0]);
+ assertFalse("Wrong number of the beans", beans.isEmpty());
+ assertContainsBeanClass(beans, "org.jboss.jsr299.tck.tests.lookup.typesafe.resolution.parameterized.IntegerHashMap");
+ }
+
+ /**
+ * Section 5.2.3 - Assignability of raw and parameterized types
+ * c) Check the required type parameter is a wildcard, the bean type parameter is an actual type and the actual type is assignable to the upper bound of the wildcard and assignable from the lower bound of the wildcard
+ *
+ * @throws CoreException
+ */
+ public void testAssignabilityOfParameterizedTypeWithActualTypesToParameterizedTypeWithWildcards() throws CoreException {
+ IInjectionPointField injection = getInjectionPointField("JavaSource/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/parameterized/InjectedBean.java", "map");
+ Set<IBean> beans = cdiProject.getBeans(true, injection);
+ assertEquals("Wrong number of the beans", 1, beans.size());
+ assertContainsBeanClass(beans, "org.jboss.jsr299.tck.tests.lookup.typesafe.resolution.parameterized.IntegerHashMap");
+ }
+
+// public void testAssignabilityOfParameterizedTypeWithActualTypesToParameterizedTypeWithWildcardsAtInjectionPoint() throws CoreException {
+// // The same as testAssignabilityOfParameterizedTypeWithActualTypesToParameterizedTypeWithWildcards()
+// }
+
+ /**
+ * Section 5.2.3 - Assignability of raw and parameterized types
+ * da) Check the required type parameter is a wildcard, the bean type parameter is a type variable and the upper bound of the type variable is assignable to the upper bound of the wildcard and assignable from the lower bound of the wildcard
+ *
+ * @throws CoreException
+ */
+ public void testAssignabilityOfParameterizedTypeWithTypeVariablesToParameterizedTypeWithWildcards() throws CoreException {
+ IInjectionPointField injection = getInjectionPointField("JavaSource/org/jboss/jsr299/tck/tests/jbt/resolution/AssignabilityOfRawAndParameterizedTypes.java", "injection");
+ Set<IBean> beans = cdiProject.getBeans(true, injection);
+ assertEquals("Wrong number of the beans", 1, beans.size());
+ assertContainsBeanClasses(beans, "org.jboss.jsr299.tck.tests.lookup.typesafe.resolution.parameterized.Result", "java.lang.Object");
+ }
+
+ /**
+ * Section 5.2.3 - Assignability of raw and parameterized types
+ * db) Check the required type parameter is a wildcard, the bean type parameter is a type variable and the upper bound of the type variable is assignable from the upper bound of the wildcard and assignable from the lower bound of the wildcard
+ *
+ * @throws CoreException
+ */
+ public void testAssignabilityOfParameterizedTypeWithTypeVariablesToParameterizedTypeWithWildcards2() throws CoreException {
+ IInjectionPointField injection = getInjectionPointField("JavaSource/org/jboss/jsr299/tck/tests/jbt/resolution/AssignabilityOfRawAndParameterizedTypes.java", "injection2");
+ Set<IBean> beans = cdiProject.getBeans(true, injection);
+ assertEquals("Wrong number of the beans", 1, beans.size());
+ assertContainsBeanClasses(beans, "org.jboss.jsr299.tck.tests.lookup.typesafe.resolution.parameterized.Result", "java.lang.Object");
+ }
+
+ /**
+ * Section 5.2.3 - Assignability of raw and parameterized types
+ * e) Check the required type parameter is an actual type, the bean type parameter is a type variable and the actual type is assignable to the upper bound of the type variable
+ *
+ * @throws CoreException
+ */
+ public void testAssignabilityOfParameterizedTypeWithTypeVariablesToParameterizedTypeWithActualTypes() throws CoreException {
+ IInjectionPointField injection = getInjectionPointField("JavaSource/org/jboss/jsr299/tck/tests/jbt/resolution/AssignabilityOfRawAndParameterizedTypes.java", "injection3");
+ Set<IBean> beans = cdiProject.getBeans(true, injection);
+ assertEquals("Wrong number of the beans", 1, beans.size());
+ assertContainsBeanClasses(beans, "org.jboss.jsr299.tck.tests.lookup.typesafe.resolution.parameterized.Result", "java.lang.Object");
+ }
+
+ /**
+ * Section 5.2.3 - Assignability of raw and parameterized types
+ * f) Check the required type parameter and the bean type parameter are both type variables and the upper bound of the required type parameter is assignable to the upper bound of the bean type parameter.
+ *
+ * @throws CoreException
+ */
+ public void testAssignabilityOfParameterizedTypeWithTypeVariablesToParameterizedTypeTypeVariable() throws CoreException {
+ IInjectionPointField injection = getInjectionPointField("JavaSource/org/jboss/jsr299/tck/tests/jbt/resolution/AssignabilityOfRawAndParameterizedTypes.java", "injection4");
+ Set<IBean> beans = cdiProject.getBeans(true, injection);
+ assertEquals("Wrong number of the beans", 1, beans.size());
+ assertContainsBeanClasses(beans, "org.jboss.jsr299.tck.tests.lookup.typesafe.resolution.parameterized.Result", "java.lang.Object");
+ }
}
\ No newline at end of file
Modified: trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/TCKTest.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/TCKTest.java 2010-06-16 12:23:13 UTC (rev 22832)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/TCKTest.java 2010-06-16 12:32:25 UTC (rev 22833)
@@ -24,6 +24,8 @@
import org.jboss.tools.cdi.core.IBean;
import org.jboss.tools.cdi.core.ICDIProject;
import org.jboss.tools.cdi.core.IClassBean;
+import org.jboss.tools.cdi.core.IInjectionPoint;
+import org.jboss.tools.cdi.core.IInjectionPointField;
import org.jboss.tools.cdi.core.IParametedType;
import org.jboss.tools.cdi.core.IQualifier;
import org.jboss.tools.cdi.core.IQualifierDeclaration;
@@ -283,6 +285,23 @@
}
}
+ protected IInjectionPointField getInjectionPointField(String beanClassFilePath, String fieldName) {
+ IFile file = tckProject.getFile(beanClassFilePath);
+ Set<IBean> beans = cdiProject.getBeans(file.getFullPath());
+ assertEquals("Wrong number of the beans", 1, beans.size());
+ Set<IInjectionPoint> injections = beans.iterator().next().getInjectionPoints();
+ for (IInjectionPoint injectionPoint : injections) {
+ if(injectionPoint instanceof IInjectionPointField) {
+ IInjectionPointField field = (IInjectionPointField)injectionPoint;
+ if(fieldName.equals(field.getField().getElementName())) {
+ return field;
+ }
+ }
+ }
+ fail("Can't find \"" + fieldName + "\" injection point filed in " + beanClassFilePath);
+ return null;
+ }
+
public static void assertContainsBeanClasses(Set<IBean> beans, String... beanClassNames) throws CoreException {
assertContainsBeanClasses(true, beans, beanClassNames);
}
Modified: trunk/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/ui/test/wizard/NewCDIWizardTest.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/ui/test/wizard/NewCDIWizardTest.java 2010-06-16 12:23:13 UTC (rev 22832)
+++ trunk/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/ui/test/wizard/NewCDIWizardTest.java 2010-06-16 12:32:25 UTC (rev 22833)
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2007 Red Hat, Inc.
+ * Copyright (c) 20010 Red Hat, Inc.
* Distributed under license by Red Hat, Inc. All rights reserved.
* This program is made available under the terms of the
* Eclipse Public License v1.0 which accompanies this distribution,
15 years, 10 months
- 1
- 0
JBoss Tools SVN: r22832 - trunk/vpe/plugins/org.jboss.tools.vpe.xulrunner/src/org/jboss/tools/vpe/xulrunner/util.
by jbosstools-commits＠lists.jboss.org
Author: mareshkau
Date: 2010-06-16 08:23:13 -0400 (Wed, 16 Jun 2010)
New Revision: 22832
Modified:
trunk/vpe/plugins/org.jboss.tools.vpe.xulrunner/src/org/jboss/tools/vpe/xulrunner/util/XPCOM.java
trunk/vpe/plugins/org.jboss.tools.vpe.xulrunner/src/org/jboss/tools/vpe/xulrunner/util/XulRunnerVpeUtils.java
Log:
https://jira.jboss.org/browse/JBIDE-6429, OSX not supported has been commented
Modified: trunk/vpe/plugins/org.jboss.tools.vpe.xulrunner/src/org/jboss/tools/vpe/xulrunner/util/XPCOM.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe.xulrunner/src/org/jboss/tools/vpe/xulrunner/util/XPCOM.java 2010-06-16 11:40:05 UTC (rev 22831)
+++ trunk/vpe/plugins/org.jboss.tools.vpe.xulrunner/src/org/jboss/tools/vpe/xulrunner/util/XPCOM.java 2010-06-16 12:23:13 UTC (rev 22832)
@@ -315,29 +315,29 @@
interfacesList.add(org.mozilla.interfaces.mozITXTToHTMLConv.class);
interfacesList.add(org.mozilla.interfaces.nsIAboutModule.class);
interfacesList.add(org.mozilla.interfaces.nsIAbstractWorker.class);
- interfacesList.add(org.mozilla.interfaces.nsIAccessible.class);
- interfacesList.add(org.mozilla.interfaces.nsIAccessibleCaretMoveEvent.class);
- interfacesList.add(org.mozilla.interfaces.nsIAccessibleCoordinateType.class);
- interfacesList.add(org.mozilla.interfaces.nsIAccessibleDocument.class);
- interfacesList.add(org.mozilla.interfaces.nsIAccessibleEditableText.class);
- interfacesList.add(org.mozilla.interfaces.nsIAccessibleEvent.class);
- interfacesList.add(org.mozilla.interfaces.nsIAccessibleHyperLink.class);
- interfacesList.add(org.mozilla.interfaces.nsIAccessibleHyperText.class);
- interfacesList.add(org.mozilla.interfaces.nsIAccessibleImage.class);
- interfacesList.add(org.mozilla.interfaces.nsIAccessibleProvider.class);
- interfacesList.add(org.mozilla.interfaces.nsIAccessibleRelation.class);
- interfacesList.add(org.mozilla.interfaces.nsIAccessibleRetrieval.class);
- interfacesList.add(org.mozilla.interfaces.nsIAccessibleRole.class);
- interfacesList.add(org.mozilla.interfaces.nsIAccessibleScrollType.class);
- interfacesList.add(org.mozilla.interfaces.nsIAccessibleSelectable.class);
- interfacesList.add(org.mozilla.interfaces.nsIAccessibleStateChangeEvent.class);
- interfacesList.add(org.mozilla.interfaces.nsIAccessibleStates.class);
- interfacesList.add(org.mozilla.interfaces.nsIAccessibleTable.class);
- interfacesList.add(org.mozilla.interfaces.nsIAccessibleTableChangeEvent.class);
- interfacesList.add(org.mozilla.interfaces.nsIAccessibleText.class);
- interfacesList.add(org.mozilla.interfaces.nsIAccessibleTextChangeEvent.class);
- interfacesList.add(org.mozilla.interfaces.nsIAccessibleValue.class);
- interfacesList.add(org.mozilla.interfaces.nsIAccessNode.class);
+// interfacesList.add(org.mozilla.interfaces.nsIAccessible.class);
+// interfacesList.add(org.mozilla.interfaces.nsIAccessibleCaretMoveEvent.class);
+// interfacesList.add(org.mozilla.interfaces.nsIAccessibleCoordinateType.class);
+// interfacesList.add(org.mozilla.interfaces.nsIAccessibleDocument.class);
+// interfacesList.add(org.mozilla.interfaces.nsIAccessibleEditableText.class);
+// interfacesList.add(org.mozilla.interfaces.nsIAccessibleEvent.class);
+// interfacesList.add(org.mozilla.interfaces.nsIAccessibleHyperLink.class);
+// interfacesList.add(org.mozilla.interfaces.nsIAccessibleHyperText.class);
+// interfacesList.add(org.mozilla.interfaces.nsIAccessibleImage.class);
+// interfacesList.add(org.mozilla.interfaces.nsIAccessibleProvider.class);
+// interfacesList.add(org.mozilla.interfaces.nsIAccessibleRelation.class);
+// interfacesList.add(org.mozilla.interfaces.nsIAccessibleRetrieval.class);
+// interfacesList.add(org.mozilla.interfaces.nsIAccessibleRole.class);
+// interfacesList.add(org.mozilla.interfaces.nsIAccessibleScrollType.class);
+// interfacesList.add(org.mozilla.interfaces.nsIAccessibleSelectable.class);
+// interfacesList.add(org.mozilla.interfaces.nsIAccessibleStateChangeEvent.class);
+// interfacesList.add(org.mozilla.interfaces.nsIAccessibleStates.class);
+// interfacesList.add(org.mozilla.interfaces.nsIAccessibleTable.class);
+// interfacesList.add(org.mozilla.interfaces.nsIAccessibleTableChangeEvent.class);
+// interfacesList.add(org.mozilla.interfaces.nsIAccessibleText.class);
+// interfacesList.add(org.mozilla.interfaces.nsIAccessibleTextChangeEvent.class);
+// interfacesList.add(org.mozilla.interfaces.nsIAccessibleValue.class);
+// interfacesList.add(org.mozilla.interfaces.nsIAccessNode.class);
interfacesList.add(org.mozilla.interfaces.nsIAddonInstallListener.class);
interfacesList.add(org.mozilla.interfaces.nsIAddonRepository.class);
interfacesList.add(org.mozilla.interfaces.nsIAddonSearchResult.class);
@@ -994,7 +994,7 @@
interfacesList.add(org.mozilla.interfaces.nsIFilePicker.class);
interfacesList.add(org.mozilla.interfaces.nsIFileProtocolHandler.class);
interfacesList.add(org.mozilla.interfaces.nsIFileURL.class);
- interfacesList.add(org.mozilla.interfaces.nsIFileView.class);
+// interfacesList.add(org.mozilla.interfaces.nsIFileView.class);
interfacesList.add(org.mozilla.interfaces.nsIFind.class);
interfacesList.add(org.mozilla.interfaces.nsIFindService.class);
interfacesList.add(org.mozilla.interfaces.nsIFlavorDataProvider.class);
@@ -1246,7 +1246,7 @@
interfacesList.add(org.mozilla.interfaces.nsIRecyclingAllocator.class);
interfacesList.add(org.mozilla.interfaces.nsIRefreshURI.class);
interfacesList.add(org.mozilla.interfaces.nsIRelativeFilePref.class);
- interfacesList.add(org.mozilla.interfaces.nsIRemoteService.class);
+// interfacesList.add(org.mozilla.interfaces.nsIRemoteService.class);
interfacesList.add(org.mozilla.interfaces.nsIRequest.class);
interfacesList.add(org.mozilla.interfaces.nsIRequestObserver.class);
interfacesList.add(org.mozilla.interfaces.nsIRequestObserverProxy.class);
@@ -1492,7 +1492,7 @@
interfacesList.add(org.mozilla.interfaces.nsIX509CertDB2.class);
interfacesList.add(org.mozilla.interfaces.nsIX509CertList.class);
interfacesList.add(org.mozilla.interfaces.nsIX509CertValidity.class);
- interfacesList.add(org.mozilla.interfaces.nsIXBLAccessible.class);
+// interfacesList.add(org.mozilla.interfaces.nsIXBLAccessible.class);
interfacesList.add(org.mozilla.interfaces.nsIXMLContentBuilder.class);
interfacesList.add(org.mozilla.interfaces.nsIXMLHttpRequest.class);
interfacesList.add(org.mozilla.interfaces.nsIXMLHttpRequestEventTarget.class);
Modified: trunk/vpe/plugins/org.jboss.tools.vpe.xulrunner/src/org/jboss/tools/vpe/xulrunner/util/XulRunnerVpeUtils.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe.xulrunner/src/org/jboss/tools/vpe/xulrunner/util/XulRunnerVpeUtils.java 2010-06-16 11:40:05 UTC (rev 22831)
+++ trunk/vpe/plugins/org.jboss.tools.vpe.xulrunner/src/org/jboss/tools/vpe/xulrunner/util/XulRunnerVpeUtils.java 2010-06-16 12:23:13 UTC (rev 22832)
@@ -15,11 +15,11 @@
import org.eclipse.swt.graphics.Rectangle;
import org.jboss.tools.vpe.xulrunner.BrowserPlugin;
-import org.mozilla.interfaces.nsIAccessNode;
-import org.mozilla.interfaces.nsIAccessible;
-import org.mozilla.interfaces.nsIAccessibleCoordinateType;
-import org.mozilla.interfaces.nsIAccessibleRetrieval;
-import org.mozilla.interfaces.nsIAccessibleText;
+//import org.mozilla.interfaces.nsIAccessNode;
+//import org.mozilla.interfaces.nsIAccessible;
+//import org.mozilla.interfaces.nsIAccessibleCoordinateType;
+//import org.mozilla.interfaces.nsIAccessibleRetrieval;
+//import org.mozilla.interfaces.nsIAccessibleText;
import org.mozilla.interfaces.nsIDOMNSElement;
import org.mozilla.interfaces.nsIDOMNSHTMLElement;
import org.mozilla.interfaces.nsIDOMNode;
@@ -105,71 +105,70 @@
* {@code selectionContainer}.
*/
public static Rectangle getTextSelectionBounds(nsIDOMText selectionContainer) {
- nsIAccessibleText accessibleTextAncestor = getAccessibleTextAncestor(selectionContainer);
- if (accessibleTextAncestor == null) {
- // cannot get selection bounds
- return null;
- }
- if (accessibleTextAncestor.getSelectionCount() == 0) {
- // no text selected
- return null;
- }
-
- int[] startOffset = new int[1];
- int[] endOffset = new int[1];
- accessibleTextAncestor.getSelectionBounds(0, startOffset, endOffset);
-
- int[] x = new int[1];
- int[] y = new int[1];
- int[] width = new int[1];
- int[] height = new int[1];
- accessibleTextAncestor.getRangeExtents(startOffset[0], endOffset[0],
- x, y, width, height, nsIAccessibleCoordinateType.COORDTYPE_PARENT_RELATIVE);
-
- nsIAccessible ancestorAccessibleParent
- = queryInterface(accessibleTextAncestor, nsIAccessible.class).getParent();
- nsIDOMNode ancestorParent
- = queryInterface(ancestorAccessibleParent, nsIAccessNode.class).getDOMNode();
-
- Rectangle ancestorParentBounds;
- if (ancestorParent != null) {
- ancestorParentBounds = getElementBounds(ancestorParent);
- } else {
- ancestorParentBounds = new Rectangle(0, 0, 0, 0);
- }
-
- return new Rectangle(ancestorParentBounds.x + x[0], ancestorParentBounds.y + y[0],
- width[0], height[0]);
+// nsIAccessibleText accessibleTextAncestor = getAccessibleTextAncestor(selectionContainer);
+// if (accessibleTextAncestor == null) {
+// // cannot get selection bounds
+// return null;
+// }
+// if (accessibleTextAncestor.getSelectionCount() == 0) {
+// // no text selected
+// return null;
+// }
+//
+// int[] startOffset = new int[1];
+// int[] endOffset = new int[1];
+// accessibleTextAncestor.getSelectionBounds(0, startOffset, endOffset);
+//
+// int[] x = new int[1];
+// int[] y = new int[1];
+// int[] width = new int[1];
+// int[] height = new int[1];
+// accessibleTextAncestor.getRangeExtents(startOffset[0], endOffset[0],
+// x, y, width, height, nsIAccessibleCoordinateType.COORDTYPE_PARENT_RELATIVE);
+//
+// nsIAccessible ancestorAccessibleParent
+// = queryInterface(accessibleTextAncestor, nsIAccessible.class).getParent();
+// nsIDOMNode ancestorParent
+// = queryInterface(ancestorAccessibleParent, nsIAccessNode.class).getDOMNode();
+//
+// Rectangle ancestorParentBounds;
+// if (ancestorParent != null) {
+// ancestorParentBounds = getElementBounds(ancestorParent);
+// } else {
+// ancestorParentBounds = new Rectangle(0, 0, 0, 0);
+// }
+//
+ return new Rectangle(0,0,0,0);
}
- /**
- * Returns the nearest ancestor of given {@code node} which supports
- * {@link nsIAccessibleText}.
- */
- private static nsIAccessibleText getAccessibleTextAncestor(nsIDOMNode node) {
- nsIAccessibleText accessibleTextAncestor = null;
- nsIDOMNode ancestor = node;
- while (accessibleTextAncestor == null && ancestor != null) {
- ancestor = ancestor.getParentNode();
- try {
- nsIAccessible accessibleAncestor = getAccessible(ancestor);
- accessibleTextAncestor = queryInterface(accessibleAncestor, nsIAccessibleText.class);
- } catch (XPCOMException e) {
- // it's OK, accessibleTextAncestor still = null
- }
- }
-
- return accessibleTextAncestor;
- }
-
- /**
- * Returns {@link nsIAccessible} interface for given {@code node}.
- */
- private static nsIAccessible getAccessible(nsIDOMNode node) {
- return ((nsIAccessibleRetrieval)
- Mozilla.getInstance().getServiceManager().getServiceByContractID(
- XPCOM.NS_ACCESSIBILITYSERVICE_CONTRACTID,
- nsIAccessibleRetrieval.NS_IACCESSIBLERETRIEVAL_IID))
- .getAccessibleFor(node);
- }
+// /**
+// * Returns the nearest ancestor of given {@code node} which supports
+// * {@link nsIAccessibleText}.
+// */
+// private static nsIAccessibleText getAccessibleTextAncestor(nsIDOMNode node) {
+// nsIAccessibleText accessibleTextAncestor = null;
+// nsIDOMNode ancestor = node;
+// while (accessibleTextAncestor == null && ancestor != null) {
+// ancestor = ancestor.getParentNode();
+// try {
+// nsIAccessible accessibleAncestor = getAccessible(ancestor);
+// accessibleTextAncestor = queryInterface(accessibleAncestor, nsIAccessibleText.class);
+// } catch (XPCOMException e) {
+// // it's OK, accessibleTextAncestor still = null
+// }
+// }
+//
+// return accessibleTextAncestor;
+// }
+//
+// /**
+// * Returns {@link nsIAccessible} interface for given {@code node}.
+// */
+// private static nsIAccessible getAccessible(nsIDOMNode node) {
+// return ((nsIAccessibleRetrieval)
+// Mozilla.getInstance().getServiceManager().getServiceByContractID(
+// XPCOM.NS_ACCESSIBILITYSERVICE_CONTRACTID,
+// nsIAccessibleRetrieval.NS_IACCESSIBLERETRIEVAL_IID))
+// .getAccessibleFor(node);
+// }
}
15 years, 10 months
- 1
- 0
JBoss Tools SVN: r22831 - in workspace/mareshkau/xulrunner-1.9.2/org.mozilla.xpcom: META-INF and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: mareshkau
Date: 2010-06-16 07:40:05 -0400 (Wed, 16 Jun 2010)
New Revision: 22831
Modified:
workspace/mareshkau/xulrunner-1.9.2/org.mozilla.xpcom/.classpath
workspace/mareshkau/xulrunner-1.9.2/org.mozilla.xpcom/META-INF/MANIFEST.MF
Log:
https://jira.jboss.org/browse/JBIDE-6429
Modified: workspace/mareshkau/xulrunner-1.9.2/org.mozilla.xpcom/.classpath
===================================================================
--- workspace/mareshkau/xulrunner-1.9.2/org.mozilla.xpcom/.classpath 2010-06-16 11:09:58 UTC (rev 22830)
+++ workspace/mareshkau/xulrunner-1.9.2/org.mozilla.xpcom/.classpath 2010-06-16 11:40:05 UTC (rev 22831)
@@ -1,8 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="src" path="src"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
- <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry exported="true" kind="lib" path="MozillaGlue.jar" />
- <classpathentry kind="output" path="bin"/>
-</classpath>
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="src" path="src"/>
+ <classpathentry exported="true" kind="lib" path="bin/"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+ <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+ <classpathentry exported="true" kind="lib" path="MozillaGlue.jar" sourcepath="/org.mozilla.xpcom.source/src/MozillaInterfaces-src.jar"/>
+ <classpathentry kind="output" path="bin"/>
+</classpath>
Modified: workspace/mareshkau/xulrunner-1.9.2/org.mozilla.xpcom/META-INF/MANIFEST.MF
===================================================================
--- workspace/mareshkau/xulrunner-1.9.2/org.mozilla.xpcom/META-INF/MANIFEST.MF 2010-06-16 11:09:58 UTC (rev 22830)
+++ workspace/mareshkau/xulrunner-1.9.2/org.mozilla.xpcom/META-INF/MANIFEST.MF 2010-06-16 11:40:05 UTC (rev 22831)
@@ -3,7 +3,8 @@
Bundle-Name: Mozilla XPCOM Eclipse plugin
Bundle-SymbolicName: org.mozilla.xpcom;singleton:=true
Bundle-Version: 1.9.2
-Bundle-ClassPath: MozillaGlue.jar
+Bundle-ClassPath: MozillaGlue.jar,
+ bin/
Export-Package: org.mozilla.interfaces,
org.mozilla.xpcom
Bundle-Vendor: mozilla.org
15 years, 10 months
- 1
- 0
JBoss Tools SVN: r22830 - workspace/mareshkau/xulrunner-1.9.2/org.mozilla.xpcom/src/org/mozilla/interfaces.
by jbosstools-commits＠lists.jboss.org
Author: yradtsevich
Date: 2010-06-16 07:09:58 -0400 (Wed, 16 Jun 2010)
New Revision: 22830
Removed:
workspace/mareshkau/xulrunner-1.9.2/org.mozilla.xpcom/src/org/mozilla/interfaces/nsIAccessNode.java
workspace/mareshkau/xulrunner-1.9.2/org.mozilla.xpcom/src/org/mozilla/interfaces/nsIAccessible.java
workspace/mareshkau/xulrunner-1.9.2/org.mozilla.xpcom/src/org/mozilla/interfaces/nsIAccessibleCaretMoveEvent.java
workspace/mareshkau/xulrunner-1.9.2/org.mozilla.xpcom/src/org/mozilla/interfaces/nsIAccessibleCoordinateType.java
workspace/mareshkau/xulrunner-1.9.2/org.mozilla.xpcom/src/org/mozilla/interfaces/nsIAccessibleDocument.java
workspace/mareshkau/xulrunner-1.9.2/org.mozilla.xpcom/src/org/mozilla/interfaces/nsIAccessibleEditableText.java
workspace/mareshkau/xulrunner-1.9.2/org.mozilla.xpcom/src/org/mozilla/interfaces/nsIAccessibleEvent.java
workspace/mareshkau/xulrunner-1.9.2/org.mozilla.xpcom/src/org/mozilla/interfaces/nsIAccessibleHyperLink.java
workspace/mareshkau/xulrunner-1.9.2/org.mozilla.xpcom/src/org/mozilla/interfaces/nsIAccessibleHyperText.java
workspace/mareshkau/xulrunner-1.9.2/org.mozilla.xpcom/src/org/mozilla/interfaces/nsIAccessibleImage.java
workspace/mareshkau/xulrunner-1.9.2/org.mozilla.xpcom/src/org/mozilla/interfaces/nsIAccessibleProvider.java
workspace/mareshkau/xulrunner-1.9.2/org.mozilla.xpcom/src/org/mozilla/interfaces/nsIAccessibleRelation.java
workspace/mareshkau/xulrunner-1.9.2/org.mozilla.xpcom/src/org/mozilla/interfaces/nsIAccessibleRetrieval.java
workspace/mareshkau/xulrunner-1.9.2/org.mozilla.xpcom/src/org/mozilla/interfaces/nsIAccessibleRole.java
workspace/mareshkau/xulrunner-1.9.2/org.mozilla.xpcom/src/org/mozilla/interfaces/nsIAccessibleScrollType.java
workspace/mareshkau/xulrunner-1.9.2/org.mozilla.xpcom/src/org/mozilla/interfaces/nsIAccessibleSelectable.java
workspace/mareshkau/xulrunner-1.9.2/org.mozilla.xpcom/src/org/mozilla/interfaces/nsIAccessibleStateChangeEvent.java
workspace/mareshkau/xulrunner-1.9.2/org.mozilla.xpcom/src/org/mozilla/interfaces/nsIAccessibleStates.java
workspace/mareshkau/xulrunner-1.9.2/org.mozilla.xpcom/src/org/mozilla/interfaces/nsIAccessibleTable.java
workspace/mareshkau/xulrunner-1.9.2/org.mozilla.xpcom/src/org/mozilla/interfaces/nsIAccessibleTableCell.java
workspace/mareshkau/xulrunner-1.9.2/org.mozilla.xpcom/src/org/mozilla/interfaces/nsIAccessibleTableChangeEvent.java
workspace/mareshkau/xulrunner-1.9.2/org.mozilla.xpcom/src/org/mozilla/interfaces/nsIAccessibleText.java
workspace/mareshkau/xulrunner-1.9.2/org.mozilla.xpcom/src/org/mozilla/interfaces/nsIAccessibleTextChangeEvent.java
workspace/mareshkau/xulrunner-1.9.2/org.mozilla.xpcom/src/org/mozilla/interfaces/nsIAccessibleValue.java
workspace/mareshkau/xulrunner-1.9.2/org.mozilla.xpcom/src/org/mozilla/interfaces/nsIAccessibleWin32Object.java
workspace/mareshkau/xulrunner-1.9.2/org.mozilla.xpcom/src/org/mozilla/interfaces/nsIActiveXSecurityPolicy.java
workspace/mareshkau/xulrunner-1.9.2/org.mozilla.xpcom/src/org/mozilla/interfaces/nsIPrintSettingsWin.java
workspace/mareshkau/xulrunner-1.9.2/org.mozilla.xpcom/src/org/mozilla/interfaces/nsITaskbarPreview.java
workspace/mareshkau/xulrunner-1.9.2/org.mozilla.xpcom/src/org/mozilla/interfaces/nsITaskbarPreviewButton.java
workspace/mareshkau/xulrunner-1.9.2/org.mozilla.xpcom/src/org/mozilla/interfaces/nsITaskbarPreviewController.java
workspace/mareshkau/xulrunner-1.9.2/org.mozilla.xpcom/src/org/mozilla/interfaces/nsITaskbarProgress.java
workspace/mareshkau/xulrunner-1.9.2/org.mozilla.xpcom/src/org/mozilla/interfaces/nsITaskbarTabPreview.java
workspace/mareshkau/xulrunner-1.9.2/org.mozilla.xpcom/src/org/mozilla/interfaces/nsITaskbarWindowPreview.java
workspace/mareshkau/xulrunner-1.9.2/org.mozilla.xpcom/src/org/mozilla/interfaces/nsIWinAppHelper.java
workspace/mareshkau/xulrunner-1.9.2/org.mozilla.xpcom/src/org/mozilla/interfaces/nsIWinTaskbar.java
workspace/mareshkau/xulrunner-1.9.2/org.mozilla.xpcom/src/org/mozilla/interfaces/nsIWindowsRegKey.java
workspace/mareshkau/xulrunner-1.9.2/org.mozilla.xpcom/src/org/mozilla/interfaces/nsIXBLAccessible.java
Log:
https://jira.jboss.org/browse/JBIDE-6429 : Move to XR1.9.2
- Sources of interfaces from org.mozilla.xpcom package have been added (only interfaces that are existing on all platforms: Mac, Linux, and Windows) STEP 2: platform-specific interfaces are removed.
Deleted: workspace/mareshkau/xulrunner-1.9.2/org.mozilla.xpcom/src/org/mozilla/interfaces/nsIAccessNode.java
===================================================================
--- workspace/mareshkau/xulrunner-1.9.2/org.mozilla.xpcom/src/org/mozilla/interfaces/nsIAccessNode.java 2010-06-16 09:39:59 UTC (rev 22829)
+++ workspace/mareshkau/xulrunner-1.9.2/org.mozilla.xpcom/src/org/mozilla/interfaces/nsIAccessNode.java 2010-06-16 11:09:58 UTC (rev 22830)
@@ -1,127 +0,0 @@
-/*
- * DO NOT EDIT. THIS FILE IS GENERATED FROM
- * /builds/slave/mozilla-1.9.2-linux-xulrunner/build/accessible/public/nsIAccessNode.idl
- */
-
-package org.mozilla.interfaces;
-
-/**
- * An interface used by in-process accessibility clients
- * to get style, window, markup and other information about
- * a DOM node. When accessibility is active in Gecko,
- * every DOM node can have one nsIAccessNode for each
- * pres shell the DOM node is rendered in.
- * The nsIAccessNode implementations are instantiated lazily.
- * The nsIAccessNode tree for a given dom window
- * has a one to one relationship to the DOM tree.
- * If the DOM node for this access node is "accessible",
- * then a QueryInterface to nsIAccessible will succeed.
- *
- * @status UNDER_REVIEW
- */
-public interface nsIAccessNode extends nsISupports {
-
- String NS_IACCESSNODE_IID =
- "{71a3b4e7-e83d-45cf-a20e-9ce292bcf19f}";
-
- /**
- * The DOM node this nsIAccessNode is associated with.
- */
- nsIDOMNode getDOMNode();
-
- /**
- * The number of DOM children for the DOM node, which
- * matches the number of nsIAccessNode children for this
- * nsIAccessNode.
- */
- int getNumChildren();
-
- /**
- * Get the nth child of this node
- * @param childNum Zero-based child index
- * @return The nth nsIAccessNode child
- */
- nsIAccessNode getChildNodeAt(int childNum);
-
- /**
- * The parent nsIAccessNode
- */
- nsIAccessNode getParentNode();
-
- /**
- * The first nsIAccessNode child
- */
- nsIAccessNode getFirstChildNode();
-
- /**
- * The last nsIAccessNode child
- */
- nsIAccessNode getLastChildNode();
-
- /**
- * The previous nsIAccessNode sibling
- */
- nsIAccessNode getPreviousSiblingNode();
-
- /**
- * The next nsIAccessNode sibling
- */
- nsIAccessNode getNextSiblingNode();
-
- /**
- * The nsIAccessibleDocument that this nsIAccessNode
- * resides in.
- */
- nsIAccessibleDocument getAccessibleDocument();
-
- /**
- * The innerHTML for the DOM node
- * This is a text string of all the markup inside the DOM
- * node, not including the start and end tag for the node.
- */
- String getInnerHTML();
-
- /**
- * Makes an object visible on screen.
- *
- * @param scrollType - defines where the object should be placed on
- * the screen (see nsIAccessibleScrollType for
- * available constants).
- */
- void scrollTo(long aScrollType);
-
- /**
- * Moves the top left of an object to a specified location.
- *
- * @param coordinateType - specifies whether the coordinates are relative to
- * the screen or the parent object (for available
- * constants refer to nsIAccessibleCoordinateType)
- * @param aX - defines the x coordinate
- * @param aY - defines the y coordinate
- */
- void scrollToPoint(long aCoordinateType, int aX, int aY);
-
- /**
- * Retrieve the computed style value for this DOM node, if it is a DOM element.
- * Note: the meanings of width, height and other size measurements depend
- * on the version of CSS being used. Therefore, for bounds information,
- * it is better to use nsIAccessible::accGetBounds.
- * @param pseudoElt The pseudo element to retrieve style for, or NULL
- * for general computed style information for this node.
- * @param propertyName Retrieve the computed style value for this property name,
- * for example "border-bottom".
- */
- String getComputedStyleValue(String pseudoElt, String propertyName);
-
- /**
- * The method is similar to getComputedStyleValue() excepting that this one
- * returns nsIDOMCSSPrimitiveValue.
- */
- nsIDOMCSSPrimitiveValue getComputedStyleCSSValue(String pseudoElt, String propertyName);
-
- /**
- * The language for the current DOM node, e.g. en, de, etc.
- */
- String getLanguage();
-
-}
\ No newline at end of file
Deleted: workspace/mareshkau/xulrunner-1.9.2/org.mozilla.xpcom/src/org/mozilla/interfaces/nsIAccessible.java
===================================================================
--- workspace/mareshkau/xulrunner-1.9.2/org.mozilla.xpcom/src/org/mozilla/interfaces/nsIAccessible.java 2010-06-16 09:39:59 UTC (rev 22829)
+++ workspace/mareshkau/xulrunner-1.9.2/org.mozilla.xpcom/src/org/mozilla/interfaces/nsIAccessible.java 2010-06-16 11:09:58 UTC (rev 22830)
@@ -1,294 +0,0 @@
-/*
- * DO NOT EDIT. THIS FILE IS GENERATED FROM
- * /builds/slave/mozilla-1.9.2-linux-xulrunner/build/accessible/public/nsIAccessible.idl
- */
-
-package org.mozilla.interfaces;
-
-/**
- * A cross-platform interface that supports platform-specific
- * accessibility APIs like MSAA and ATK. Contains the sum of what's needed
- * to support IAccessible as well as ATK's generic accessibility objects.
- * Can also be used by in-process accessibility clients to get information
- * about objects in the accessible tree. The accessible tree is a subset of
- * nodes in the DOM tree -- such as documents, focusable elements and text.
- * Mozilla creates the implementations of nsIAccessible on demand.
- * See http://www.mozilla.org/projects/ui/accessibility for more information.
- *
- * @status UNDER_REVIEW
- */
-public interface nsIAccessible extends nsISupports {
-
- String NS_IACCESSIBLE_IID =
- "{c81d8f8c-8585-4094-bc7c-71dd01494906}";
-
- /**
- * Parent node in accessible tree.
- */
- nsIAccessible getParent();
-
- /**
- * Next sibling in accessible tree
- */
- nsIAccessible getNextSibling();
-
- /**
- * Previous sibling in accessible tree
- */
- nsIAccessible getPreviousSibling();
-
- /**
- * First child in accessible tree
- */
- nsIAccessible getFirstChild();
-
- /**
- * Last child in accessible tree
- */
- nsIAccessible getLastChild();
-
- /**
- * Array of all this element's children.
- */
- nsIArray getChildren();
-
- /**
- * Number of accessible children
- */
- int getChildCount();
-
- /**
- * The 0-based index of this accessible in its parent's list of children,
- * or -1 if this accessible does not have a parent.
- */
- int getIndexInParent();
-
- /**
- * Accessible name -- the main text equivalent for this node. The name is
- * specified by ARIA or by native markup. Example of ARIA markup is
- * aria-labelledby attribute placed on element of this accessible. Example
- * of native markup is HTML label linked with HTML element of this accessible.
- *
- * Value can be string or null. A null value indicates that AT may attempt to
- * compute the name. Any string value, including the empty string, should be
- * considered author-intentional, and respected.
- */
- String getName();
-
- /**
- * Accessible name -- the main text equivalent for this node. The name is
- * specified by ARIA or by native markup. Example of ARIA markup is
- * aria-labelledby attribute placed on element of this accessible. Example
- * of native markup is HTML label linked with HTML element of this accessible.
- *
- * Value can be string or null. A null value indicates that AT may attempt to
- * compute the name. Any string value, including the empty string, should be
- * considered author-intentional, and respected.
- */
- void setName(String aName);
-
- /**
- * Accessible value -- a number or a secondary text equivalent for this node
- * Widgets that use role attribute can force a value using the valuenow attribute
- */
- String getValue();
-
- /**
- * Accessible description -- long text associated with this node
- */
- String getDescription();
-
- /**
- * Provides localized string of accesskey name, such as Alt+D.
- * The modifier may be affected by user and platform preferences.
- * Usually alt+letter, or just the letter alone for menu items.
- */
- String getKeyboardShortcut();
-
- /**
- * Provides localized string of global keyboard accelerator for default
- * action, such as Ctrl+O for Open file
- */
- String getDefaultKeyBinding();
-
- /**
- * Provides array of localized string of global keyboard accelerator for
- * the given action index supported by accessible.
- *
- * @param aActionIndex - index of the given action
- */
- nsIDOMDOMStringList getKeyBindings(short aActionIndex);
-
- /**
- * Enumerated accessible role (see the constants defined in nsIAccessibleRole).
- *
- * @note The values might depend on platform because of variations. Widgets
- * can use ARIA role attribute to force the final role.
- */
- long getRole();
-
- /**
- * Accessible states -- bit fields which describe boolean properties of node.
- * Many states are only valid given a certain role attribute that supports
- * them.
- *
- * @param aState - the first bit field (see nsIAccessibleStates::STATE_*
- * constants)
- * @param aExtraState - the second bit field
- * (see nsIAccessibleStates::EXT_STATE_* constants)
- */
- void getState(long[] aState, long[] aExtraState);
-
- /**
- * Help text associated with node
- */
- String getHelp();
-
- /**
- * Focused accessible child of node
- */
- nsIAccessible getFocusedChild();
-
- /**
- * Attributes of accessible
- */
- nsIPersistentProperties getAttributes();
-
- /**
- * Returns grouping information. Used for tree items, list items, tab panel
- * labels, radio buttons, etc. Also used for collectons of non-text objects.
- *
- * @param groupLevel - 1-based, similar to ARIA 'level' property
- * @param similarItemsInGroup - 1-based, similar to ARIA 'setsize' property,
- * inclusive of the current item
- * @param positionInGroup - 1-based, similar to ARIA 'posinset' property
- */
- void groupPosition(int[] aGroupLevel, int[] aSimilarItemsInGroup, int[] aPositionInGroup);
-
- /**
- * Accessible child which contains the coordinate at (x, y) in screen pixels.
- * If the point is in the current accessible but not in a child, the
- * current accessible will be returned.
- * If the point is in neither the current accessible or a child, then
- * null will be returned.
- *
- * @param x screen's x coordinate
- * @param y screen's y coordinate
- * @return the deepest accessible child containing the given point
- */
- nsIAccessible getChildAtPoint(int x, int y);
-
- /**
- * Deepest accessible child which contains the coordinate at (x, y) in screen
- * pixels. If the point is in the current accessible but not in a child, the
- * current accessible will be returned. If the point is in neither the current
- * accessible or a child, then null will be returned.
- *
- * @param x screen's x coordinate
- * @param y screen's y coordinate
- * @return the deepest accessible child containing the given point
- */
- nsIAccessible getDeepestChildAtPoint(int x, int y);
-
- /**
- * Nth accessible child using zero-based index or last child if index less than zero
- */
- nsIAccessible getChildAt(int aChildIndex);
-
- /**
- * Accessible node geometrically to the right of this one
- */
- nsIAccessible getAccessibleToRight();
-
- /**
- * Accessible node geometrically to the left of this one
- */
- nsIAccessible getAccessibleToLeft();
-
- /**
- * Accessible node geometrically above this one
- */
- nsIAccessible getAccessibleAbove();
-
- /**
- * Accessible node geometrically below this one
- */
- nsIAccessible getAccessibleBelow();
-
- /**
- * Return accessible relation by the given relation type (see.
- * constants defined in nsIAccessibleRelation).
- */
- nsIAccessibleRelation getRelationByType(long aRelationType);
-
- /**
- * Returns the number of accessible relations for this object.
- */
- long getRelationsCount();
-
- /**
- * Returns one accessible relation for this object.
- *
- * @param index - relation index (0-based)
- */
- nsIAccessibleRelation getRelation(long index);
-
- /**
- * Returns multiple accessible relations for this object.
- */
- nsIArray getRelations();
-
- /**
- * Return accessible's x and y coordinates relative to the screen and
- * accessible's width and height.
- */
- void getBounds(int[] x, int[] y, int[] width, int[] height);
-
- /**
- * Add or remove this accessible to the current selection
- */
- void setSelected(boolean isSelected);
-
- /**
- * Extend the current selection from its current accessible anchor node
- * to this accessible
- */
- void extendSelection();
-
- /**
- * Select this accessible node only
- */
- void takeSelection();
-
- /**
- * Focus this accessible node,
- * The state STATE_FOCUSABLE indicates whether this node is normally focusable.
- * It is the callers responsibility to determine whether this node is focusable.
- * accTakeFocus on a node that is not normally focusable (such as a table),
- * will still set focus on that node, although normally that will not be visually
- * indicated in most style sheets.
- */
- void takeFocus();
-
- /**
- * The number of accessible actions associated with this accessible
- */
- short getNumActions();
-
- /**
- * The name of the accessible action at the given zero-based index
- */
- String getActionName(short index);
-
- /**
- * The description of the accessible action at the given zero-based index
- */
- String getActionDescription(short aIndex);
-
- /**
- * Perform the accessible action at the given zero-based index
- * Action number 0 is the default action
- */
- void doAction(short index);
-
-}
\ No newline at end of file
Deleted: workspace/mareshkau/xulrunner-1.9.2/org.mozilla.xpcom/src/org/mozilla/interfaces/nsIAccessibleCaretMoveEvent.java
===================================================================
--- workspace/mareshkau/xulrunner-1.9.2/org.mozilla.xpcom/src/org/mozilla/interfaces/nsIAccessibleCaretMoveEvent.java 2010-06-16 09:39:59 UTC (rev 22829)
+++ workspace/mareshkau/xulrunner-1.9.2/org.mozilla.xpcom/src/org/mozilla/interfaces/nsIAccessibleCaretMoveEvent.java 2010-06-16 11:09:58 UTC (rev 22830)
@@ -1,18 +0,0 @@
-/*
- * DO NOT EDIT. THIS FILE IS GENERATED FROM
- * /builds/slave/mozilla-1.9.2-linux-xulrunner/build/accessible/public/nsIAccessibleEvent.idl
- */
-
-package org.mozilla.interfaces;
-
-public interface nsIAccessibleCaretMoveEvent extends nsIAccessibleEvent {
-
- String NS_IACCESSIBLECARETMOVEEVENT_IID =
- "{b9076dce-4cd3-4e3d-a7f6-7f33a7f40c31}";
-
- /**
- * Return caret offset.
- */
- int getCaretOffset();
-
-}
\ No newline at end of file
Deleted: workspace/mareshkau/xulrunner-1.9.2/org.mozilla.xpcom/src/org/mozilla/interfaces/nsIAccessibleCoordinateType.java
===================================================================
--- workspace/mareshkau/xulrunner-1.9.2/org.mozilla.xpcom/src/org/mozilla/interfaces/nsIAccessibleCoordinateType.java 2010-06-16 09:39:59 UTC (rev 22829)
+++ workspace/mareshkau/xulrunner-1.9.2/org.mozilla.xpcom/src/org/mozilla/interfaces/nsIAccessibleCoordinateType.java 2010-06-16 11:09:58 UTC (rev 22830)
@@ -1,32 +0,0 @@
-/*
- * DO NOT EDIT. THIS FILE IS GENERATED FROM
- * /builds/slave/mozilla-1.9.2-linux-xulrunner/build/accessible/public/nsIAccessibleTypes.idl
- */
-
-package org.mozilla.interfaces;
-
-/**
- * These constants define which coordinate system a point is located in.
- */
-public interface nsIAccessibleCoordinateType extends nsISupports {
-
- String NS_IACCESSIBLECOORDINATETYPE_IID =
- "{c9fbdf10-619e-436f-bf4b-8566686f1577}";
-
- /**
- * The coordinates are relative to the screen.
- */
- long COORDTYPE_SCREEN_RELATIVE = 0L;
-
- /**
- * The coordinates are relative to the window.
- */
- long COORDTYPE_WINDOW_RELATIVE = 1L;
-
- /**
- * The coordinates are relative to the upper left corner of the bounding box
- * of the immediate parent.
- */
- long COORDTYPE_PARENT_RELATIVE = 2L;
-
-}
\ No newline at end of file
Deleted: workspace/mareshkau/xulrunner-1.9.2/org.mozilla.xpcom/src/org/mozilla/interfaces/nsIAccessibleDocument.java
===================================================================
--- workspace/mareshkau/xulrunner-1.9.2/org.mozilla.xpcom/src/org/mozilla/interfaces/nsIAccessibleDocument.java 2010-06-16 09:39:59 UTC (rev 22829)
+++ workspace/mareshkau/xulrunner-1.9.2/org.mozilla.xpcom/src/org/mozilla/interfaces/nsIAccessibleDocument.java 2010-06-16 11:09:58 UTC (rev 22830)
@@ -1,73 +0,0 @@
-/*
- * DO NOT EDIT. THIS FILE IS GENERATED FROM
- * /builds/slave/mozilla-1.9.2-linux-xulrunner/build/accessible/public/nsIAccessibleDocument.idl
- */
-
-package org.mozilla.interfaces;
-
-/**
- * An interface for in-process accessibility clients
- * that wish to retrieve information about a document.
- * When accessibility is turned on in Gecko,
- * there is an nsIAccessibleDocument for each document
- * whether it is XUL, HTML or whatever.
- * You can QueryInterface to nsIAccessibleDocument from
- * the nsIAccessible or nsIAccessNode for the root node
- * of a document. You can also get one from
- * nsIAccessNode::GetAccessibleDocument() or
- * nsIAccessibleEvent::GetAccessibleDocument()
- *
- * @status UNDER_REVIEW
- */
-public interface nsIAccessibleDocument extends nsISupports {
-
- String NS_IACCESSIBLEDOCUMENT_IID =
- "{b7ae45bd-21e9-4ed5-a67e-86448b25d56b}";
-
- /**
- * The URL of the document
- */
- String getURL();
-
- /**
- * The title of the document, as specified in the document.
- */
- String getTitle();
-
- /**
- * The mime type of the document
- */
- String getMimeType();
-
- /**
- * The doc type of the document, as specified in the document.
- */
- String getDocType();
-
- /**
- * The nsIDOMDocument interface associated with this document.
- */
- nsIDOMDocument getDocument();
-
- /**
- * The nsIDOMWindow that the document resides in.
- */
- nsIDOMWindow getWindow();
-
- /**
- * The namespace for each ID that is handed back.
- */
- String getNameSpaceURIForID(short nameSpaceID);
-
- /**
- * Returns the first accessible parent of a DOM node.
- * Guaranteed not to return nsnull if the DOM node is in a document.
- * @param aDOMNode The DOM node we need an accessible for.
- * @param aCanCreate Can accessibles be created or must it be the first
- * cached accessible in the parent chain?
- * @return An first nsIAccessible found by crawling up the DOM node
- * to the document root.
- */
- nsIAccessible getAccessibleInParentChain(nsIDOMNode aDOMNode, boolean aCanCreate);
-
-}
\ No newline at end of file
Deleted: workspace/mareshkau/xulrunner-1.9.2/org.mozilla.xpcom/src/org/mozilla/interfaces/nsIAccessibleEditableText.java
===================================================================
--- workspace/mareshkau/xulrunner-1.9.2/org.mozilla.xpcom/src/org/mozilla/interfaces/nsIAccessibleEditableText.java 2010-06-16 09:39:59 UTC (rev 22829)
+++ workspace/mareshkau/xulrunner-1.9.2/org.mozilla.xpcom/src/org/mozilla/interfaces/nsIAccessibleEditableText.java 2010-06-16 11:09:58 UTC (rev 22830)
@@ -1,70 +0,0 @@
-/*
- * DO NOT EDIT. THIS FILE IS GENERATED FROM
- * /builds/slave/mozilla-1.9.2-linux-xulrunner/build/accessible/public/nsIAccessibleEditableText.idl
- */
-
-package org.mozilla.interfaces;
-
-public interface nsIAccessibleEditableText extends nsISupports {
-
- String NS_IACCESSIBLEEDITABLETEXT_IID =
- "{52837507-202d-4e72-a482-5f068a1fd720}";
-
- /**
- * Sets the attributes for the text between the two given indices. The old
- * attributes are replaced by the new list of attributes. For example,
- * sets font styles, such as italic, bold...
- *
- * @param startPos - start index of the text whose attributes are modified.
- * @param endPos - end index of the text whose attributes are modified.
- * @param attributes - set of attributes that replaces the old list of
- * attributes of the specified text portion.
- */
- void setAttributes(int startPos, int endPos, nsISupports attributes);
-
- /**
- * Replaces the text represented by this object by the given text.
- */
- void setTextContents(String text);
-
- /**
- * Inserts text at the specified position.
- *
- * @param text - text that is inserted.
- * @param position - index at which to insert the text.
- */
- void insertText(String text, int position);
-
- /**
- * Copies the text range into the clipboard.
- *
- * @param startPos - start index of the text to moved into the clipboard.
- * @param endPos - end index of the text to moved into the clipboard.
- */
- void copyText(int startPos, int endPos);
-
- /**
- * Deletes a range of text and copies it to the clipboard.
- *
- * @param startPos - start index of the text to be deleted.
- * @param endOffset - end index of the text to be deleted.
- */
- void cutText(int startPos, int endPos);
-
- /**
- * Deletes a range of text.
- *
- * @param startPos - start index of the text to be deleted.
- * @param endPos - end index of the text to be deleted.
- */
- void deleteText(int startPos, int endPos);
-
- /**
- * Pastes text from the clipboard.
- *
- * @param position - index at which to insert the text from the system
- * clipboard into the text represented by this object.
- */
- void pasteText(int position);
-
-}
\ No newline at end of file
Deleted: workspace/mareshkau/xulrunner-1.9.2/org.mozilla.xpcom/src/org/mozilla/interfaces/nsIAccessibleEvent.java
===================================================================
--- workspace/mareshkau/xulrunner-1.9.2/org.mozilla.xpcom/src/org/mozilla/interfaces/nsIAccessibleEvent.java 2010-06-16 09:39:59 UTC (rev 22829)
+++ workspace/mareshkau/xulrunner-1.9.2/org.mozilla.xpcom/src/org/mozilla/interfaces/nsIAccessibleEvent.java 2010-06-16 11:09:58 UTC (rev 22830)
@@ -1,494 +0,0 @@
-/*
- * DO NOT EDIT. THIS FILE IS GENERATED FROM
- * /builds/slave/mozilla-1.9.2-linux-xulrunner/build/accessible/public/nsIAccessibleEvent.idl
- */
-
-package org.mozilla.interfaces;
-
-/**
- * An interface for accessibility events listened to
- * by in-process accessibility clients, which can be used
- * to find out how to get accessibility and DOM interfaces for
- * the event and its target. To listen to in-process accessibility invents,
- * make your object an nsIObserver, and listen for accessible-event by
- * using code something like this:
- * nsCOMPtr<nsIObserverService> observerService =
- * do_GetService("@mozilla.org/observer-service;1", &rv);
- * if (NS_SUCCEEDED(rv))
- * rv = observerService->AddObserver(this, "accessible-event", PR_TRUE);
- *
- * @status UNDER_REVIEW
- */
-public interface nsIAccessibleEvent extends nsISupports {
-
- String NS_IACCESSIBLEEVENT_IID =
- "{ba448f0e-a761-48c8-a0f5-1f25e23d4fe4}";
-
- /**
- * An object has been created.
- */
- long EVENT_DOM_CREATE = 1L;
-
- /**
- * An object has been destroyed.
- */
- long EVENT_DOM_DESTROY = 2L;
-
- /**
- * An object's properties or content have changed significantly so that the
- * type of object has really changed, and therefore the accessible should be
- * destroyed or recreated.
- */
- long EVENT_DOM_SIGNIFICANT_CHANGE = 3L;
-
- /**
- * A hidden object is shown -- this is a layout occurance and is thus asynchronous
- */
- long EVENT_ASYNCH_SHOW = 4L;
-
- /**
- * An object is hidden -- this is a layout occurance and is thus asynchronous
- */
- long EVENT_ASYNCH_HIDE = 5L;
-
- /**
- * An object had a significant layout change which could affect
- * the type of accessible object -- this is a layout occurance and is thus asynchronous
- */
- long EVENT_ASYNCH_SIGNIFICANT_CHANGE = 6L;
-
- /**
- * The active descendant of a component has changed. The active descendant
- * is used in objects with transient children.
- */
- long EVENT_ACTIVE_DECENDENT_CHANGED = 7L;
-
- /**
- * An object has received the keyboard focus.
- */
- long EVENT_FOCUS = 8L;
-
- /**
- * An object's state has changed.
- */
- long EVENT_STATE_CHANGE = 9L;
-
- /**
- * An object has changed location, shape, or size.
- */
- long EVENT_LOCATION_CHANGE = 10L;
-
- /**
- * An object's Name property has changed.
- */
- long EVENT_NAME_CHANGE = 11L;
-
- /**
- * An object's Description property has changed.
- */
- long EVENT_DESCRIPTION_CHANGE = 12L;
-
- /**
- * An object's Value property has changed.
- */
- long EVENT_VALUE_CHANGE = 13L;
-
- /**
- * An object's help has changed.
- */
- long EVENT_HELP_CHANGE = 14L;
-
- /**
- * An object's default action has changed.
- */
- long EVENT_DEFACTION_CHANGE = 15L;
-
- /**
- * An object's action has changed.
- */
- long EVENT_ACTION_CHANGE = 16L;
-
- /**
- * An object's keyboard shortcut has changed.
- */
- long EVENT_ACCELERATOR_CHANGE = 17L;
-
- /**
- * The selection within a container object has changed.
- */
- long EVENT_SELECTION = 18L;
-
- /**
- * An item within a container object has been added to the selection.
- */
- long EVENT_SELECTION_ADD = 19L;
-
- /**
- * An item within a container object has been removed from the selection.
- */
- long EVENT_SELECTION_REMOVE = 20L;
-
- /**
- * Numerous selection changes have occurred within a container object.
- */
- long EVENT_SELECTION_WITHIN = 21L;
-
- /**
- * An alert has been generated. Server applications send this event when a
- * user needs to know that a user interface element has changed.
- */
- long EVENT_ALERT = 22L;
-
- /**
- * The foreground window has changed.
- */
- long EVENT_FOREGROUND = 23L;
-
- /**
- * A menu item on the menu bar has been selected.
- */
- long EVENT_MENU_START = 24L;
-
- /**
- * A menu from the menu bar has been closed.
- */
- long EVENT_MENU_END = 25L;
-
- /**
- * A pop-up menu has been displayed.
- */
- long EVENT_MENUPOPUP_START = 26L;
-
- /**
- * A pop-up menu has been closed.
- */
- long EVENT_MENUPOPUP_END = 27L;
-
- /**
- * A window has received mouse capture.
- */
- long EVENT_CAPTURE_START = 28L;
-
- /**
- * A window has lost mouse capture.
- */
- long EVENT_CAPTURE_END = 29L;
-
- /**
- * A window is being moved or resized.
- */
- long EVENT_MOVESIZE_START = 30L;
-
- /**
- * The movement or resizing of a window has finished
- */
- long EVENT_MOVESIZE_END = 31L;
-
- /**
- * A window has entered context-sensitive Help mode
- */
- long EVENT_CONTEXTHELP_START = 32L;
-
- /**
- * A window has exited context-sensitive Help mode
- */
- long EVENT_CONTEXTHELP_END = 33L;
-
- /**
- * An application is about to enter drag-and-drop mode
- */
- long EVENT_DRAGDROP_START = 34L;
-
- /**
- * An application is about to exit drag-and-drop mode
- */
- long EVENT_DRAGDROP_END = 35L;
-
- /**
- * A dialog box has been displayed
- */
- long EVENT_DIALOG_START = 36L;
-
- /**
- * A dialog box has been closed
- */
- long EVENT_DIALOG_END = 37L;
-
- /**
- * Scrolling has started on a scroll bar
- */
- long EVENT_SCROLLING_START = 38L;
-
- /**
- * Scrolling has ended on a scroll bar
- */
- long EVENT_SCROLLING_END = 39L;
-
- /**
- * A window object is about to be minimized or maximized
- */
- long EVENT_MINIMIZE_START = 40L;
-
- /**
- * A window object has been minimized or maximized
- */
- long EVENT_MINIMIZE_END = 41L;
-
- /**
- * XXX:
- */
- long EVENT_DOCUMENT_LOAD_START = 42L;
-
- /**
- * The loading of the document has completed.
- */
- long EVENT_DOCUMENT_LOAD_COMPLETE = 43L;
-
- /**
- * The document contents are being reloaded.
- */
- long EVENT_DOCUMENT_RELOAD = 44L;
-
- /**
- * The loading of the document was interrupted.
- */
- long EVENT_DOCUMENT_LOAD_STOPPED = 45L;
-
- /**
- * The document wide attributes of the document object have changed.
- */
- long EVENT_DOCUMENT_ATTRIBUTES_CHANGED = 46L;
-
- /**
- * The contents of the document have changed.
- */
- long EVENT_DOCUMENT_CONTENT_CHANGED = 47L;
-
- long EVENT_PROPERTY_CHANGED = 48L;
-
- long EVENT_SELECTION_CHANGED = 49L;
-
- /**
- * A text object's attributes changed.
- * Also see EVENT_OBJECT_ATTRIBUTE_CHANGED.
- */
- long EVENT_TEXT_ATTRIBUTE_CHANGED = 50L;
-
- /**
- * The caret has moved to a new position.
- */
- long EVENT_TEXT_CARET_MOVED = 51L;
-
- /**
- * This event indicates general text changes, i.e. changes to text that is
- * exposed through the IAccessibleText and IAccessibleEditableText interfaces.
- */
- long EVENT_TEXT_CHANGED = 52L;
-
- /**
- * Text was inserted.
- */
- long EVENT_TEXT_INSERTED = 53L;
-
- /**
- * Text was removed.
- */
- long EVENT_TEXT_REMOVED = 54L;
-
- /**
- * Text was updated.
- */
- long EVENT_TEXT_UPDATED = 55L;
-
- /**
- * The text selection changed.
- */
- long EVENT_TEXT_SELECTION_CHANGED = 56L;
-
- /**
- * A visibile data event indicates the change of the visual appearance
- * of an accessible object. This includes for example most of the
- * attributes available via the IAccessibleComponent interface.
- */
- long EVENT_VISIBLE_DATA_CHANGED = 57L;
-
- /**
- * The caret moved from one column to the next.
- */
- long EVENT_TEXT_COLUMN_CHANGED = 58L;
-
- /**
- * The caret moved from one section to the next.
- */
- long EVENT_SECTION_CHANGED = 59L;
-
- /**
- * A table caption changed.
- */
- long EVENT_TABLE_CAPTION_CHANGED = 60L;
-
- /**
- * A table's data changed.
- */
- long EVENT_TABLE_MODEL_CHANGED = 61L;
-
- /**
- * A table's summary changed.
- */
- long EVENT_TABLE_SUMMARY_CHANGED = 62L;
-
- /**
- * A table's row description changed.
- */
- long EVENT_TABLE_ROW_DESCRIPTION_CHANGED = 63L;
-
- /**
- * A table's row header changed.
- */
- long EVENT_TABLE_ROW_HEADER_CHANGED = 64L;
-
- long EVENT_TABLE_ROW_INSERT = 65L;
-
- long EVENT_TABLE_ROW_DELETE = 66L;
-
- long EVENT_TABLE_ROW_REORDER = 67L;
-
- /**
- * A table's column description changed.
- */
- long EVENT_TABLE_COLUMN_DESCRIPTION_CHANGED = 68L;
-
- /**
- * A table's column header changed.
- */
- long EVENT_TABLE_COLUMN_HEADER_CHANGED = 69L;
-
- long EVENT_TABLE_COLUMN_INSERT = 70L;
-
- long EVENT_TABLE_COLUMN_DELETE = 71L;
-
- long EVENT_TABLE_COLUMN_REORDER = 72L;
-
- long EVENT_WINDOW_ACTIVATE = 73L;
-
- long EVENT_WINDOW_CREATE = 74L;
-
- long EVENT_WINDOW_DEACTIVATE = 75L;
-
- long EVENT_WINDOW_DESTROY = 76L;
-
- long EVENT_WINDOW_MAXIMIZE = 77L;
-
- long EVENT_WINDOW_MINIMIZE = 78L;
-
- long EVENT_WINDOW_RESIZE = 79L;
-
- long EVENT_WINDOW_RESTORE = 80L;
-
- /**
- * The ending index of this link within the containing string has changed.
- */
- long EVENT_HYPERLINK_END_INDEX_CHANGED = 81L;
-
- /**
- * The number of anchors assoicated with this hyperlink object has changed.
- */
- long EVENT_HYPERLINK_NUMBER_OF_ANCHORS_CHANGED = 82L;
-
- /**
- * The hyperlink selected state changed from selected to unselected or
- * from unselected to selected.
- */
- long EVENT_HYPERLINK_SELECTED_LINK_CHANGED = 83L;
-
- /**
- * One of the links associated with the hypertext object has been activated.
- */
- long EVENT_HYPERTEXT_LINK_ACTIVATED = 84L;
-
- /**
- * One of the links associated with the hypertext object has been selected.
- */
- long EVENT_HYPERTEXT_LINK_SELECTED = 85L;
-
- /**
- * The starting index of this link within the containing string has changed.
- */
- long EVENT_HYPERLINK_START_INDEX_CHANGED = 86L;
-
- /**
- * Focus has changed from one hypertext object to another, or focus moved
- * from a non-hypertext object to a hypertext object, or focus moved from a
- * hypertext object to a non-hypertext object.
- */
- long EVENT_HYPERTEXT_CHANGED = 87L;
-
- /**
- * The number of hyperlinks associated with a hypertext object changed.
- */
- long EVENT_HYPERTEXT_NLINKS_CHANGED = 88L;
-
- /**
- * An object's attributes changed. Also see EVENT_TEXT_ATTRIBUTE_CHANGED.
- */
- long EVENT_OBJECT_ATTRIBUTE_CHANGED = 89L;
-
- /**
- * A slide changed in a presentation document or a page boundary was
- * crossed in a word processing document.
- */
- long EVENT_PAGE_CHANGED = 90L;
-
- /**
- * Used internally in Gecko.
- */
- long EVENT_INTERNAL_LOAD = 91L;
-
- /**
- * An object's children have changed
- */
- long EVENT_REORDER = 92L;
-
- /**
- * Help make sure event map does not get out-of-line.
- */
- long EVENT_LAST_ENTRY = 93L;
-
- /**
- * The type of event, based on the enumerated event values
- * defined in this interface.
- */
- long getEventType();
-
- /**
- * The nsIAccessible associated with the event.
- * May return null if no accessible is available
- */
- nsIAccessible getAccessible();
-
- /**
- * The nsIAccessibleDocument that the event target nsIAccessible
- * resides in. This can be used to get the DOM window,
- * the DOM document and the window handler, among other things.
- */
- nsIAccessibleDocument getAccessibleDocument();
-
- /**
- * The nsIDOMNode associated with the event
- * May return null if accessible for event has been shut down
- */
- nsIDOMNode getDOMNode();
-
- /**
- * Returns true if the event was caused by explicit user input,
- * as opposed to purely originating from a timer or mouse movement
- */
- boolean getIsFromUserInput();
-
- /**
- * Returns true if the event was caused by explicit user input,
- * as opposed to purely originating from a timer or mouse movement
- */
- void setIsFromUserInput(boolean aIsFromUserInput);
-
-}
\ No newline at end of file
Deleted: workspace/mareshkau/xulrunner-1.9.2/org.mozilla.xpcom/src/org/mozilla/interfaces/nsIAccessibleHyperLink.java
===================================================================
--- workspace/mareshkau/xulrunner-1.9.2/org.mozilla.xpcom/src/org/mozilla/interfaces/nsIAccessibleHyperLink.java 2010-06-16 09:39:59 UTC (rev 22829)
+++ workspace/mareshkau/xulrunner-1.9.2/org.mozilla.xpcom/src/org/mozilla/interfaces/nsIAccessibleHyperLink.java 2010-06-16 11:09:58 UTC (rev 22830)
@@ -1,78 +0,0 @@
-/*
- * DO NOT EDIT. THIS FILE IS GENERATED FROM
- * /builds/slave/mozilla-1.9.2-linux-xulrunner/build/accessible/public/nsIAccessibleHyperLink.idl
- */
-
-package org.mozilla.interfaces;
-
-/**
- * A cross-platform interface that supports hyperlink-specific properties and
- * methods. Anchors, image maps, xul:labels with class="text-link" implement this interface.
- */
-public interface nsIAccessibleHyperLink extends nsISupports {
-
- String NS_IACCESSIBLEHYPERLINK_IID =
- "{38c60bfa-6040-4bfe-93f2-acd6a909bb60}";
-
- /**
- * Returns the offset of the link within the parent accessible.
- */
- int getStartIndex();
-
- /**
- * Returns the end index of the link within the parent accessible.
- *
- * @note The link itself is represented by one embedded character within the
- * parent text, so the endIndex should be startIndex + 1.
- */
- int getEndIndex();
-
- /**
- * Determines whether the link is valid (e. g. points to a valid URL).
- *
- * @note XXX Currently only used with ARIA links, and the author has to
- * specify that the link is invalid via the aria-invalid="true" attribute.
- * In all other cases, TRUE is returned.
- */
- boolean getValid();
-
- /**
- * Determines whether the element currently has the focus, e. g. after
- * returning from the destination page.
- *
- * @note ARIA links can only be focused if they have the tabindex
- * attribute set. Also, state_focused should then be set on the accessible
- * for this link.
- */
- boolean getSelected();
-
- /**
- * The numbber of anchors within this Hyperlink. Is normally 1 for anchors.
- * This anchor is, for example, the visible output of the html:a tag.
- * With an Image Map, reflects the actual areas within the map.
- */
- int getAnchorCount();
-
- /**
- * Returns the URI at the given index.
- *
- * @note ARIA hyperlinks do not have an URI to point to, since clicks are
- * processed via JavaScript. Therefore this property does not work on ARIA
- * links.
- *
- * @param index The 0-based index of the URI to be returned.
- *
- * @return the nsIURI object containing the specifications for the URI.
- */
- nsIURI getURI(int index);
-
- /**
- * Returns a reference to the object at the given index.
- *
- * @param index The 0-based index whose object is to be returned.
- *
- * @return the nsIAccessible object at the desired index.
- */
- nsIAccessible getAnchor(int index);
-
-}
\ No newline at end of file
Deleted: workspace/mareshkau/xulrunner-1.9.2/org.mozilla.xpcom/src/org/mozilla/interfaces/nsIAccessibleHyperText.java
===================================================================
--- workspace/mareshkau/xulrunner-1.9.2/org.mozilla.xpcom/src/org/mozilla/interfaces/nsIAccessibleHyperText.java 2010-06-16 09:39:59 UTC (rev 22829)
+++ workspace/mareshkau/xulrunner-1.9.2/org.mozilla.xpcom/src/org/mozilla/interfaces/nsIAccessibleHyperText.java 2010-06-16 11:09:58 UTC (rev 22830)
@@ -1,34 +0,0 @@
-/*
- * DO NOT EDIT. THIS FILE IS GENERATED FROM
- * /builds/slave/mozilla-1.9.2-linux-xulrunner/build/accessible/public/nsIAccessibleHyperText.idl
- */
-
-package org.mozilla.interfaces;
-
-/**
- * A cross-platform interface that deals with text which contains hyperlinks.
- */
-public interface nsIAccessibleHyperText extends nsISupports {
-
- String NS_IACCESSIBLEHYPERTEXT_IID =
- "{d56bd454-8ff3-4edc-b266-baeada00267b}";
-
- /**
- * Returns the number of links contained within this hypertext object.
- */
- int getLinkCount();
-
- int getLinkIndex(int charIndex);
-
- /**
- * Retrieves the nsIAccessibleHyperLink object at the given link index.
- *
- * @param linkIndex 0-based index of the link that is to be retrieved.
- * This can be retrieved via getLinkIndex (see above).
- *
- * @returns nsIAccessibleHyperLink Object representing the link properties
- * or NS_ERROR_INVALID_ARG if there is no link at that index.
- */
- nsIAccessibleHyperLink getLink(int linkIndex);
-
-}
\ No newline at end of file
Deleted: workspace/mareshkau/xulrunner-1.9.2/org.mozilla.xpcom/src/org/mozilla/interfaces/nsIAccessibleImage.java
===================================================================
--- workspace/mareshkau/xulrunner-1.9.2/org.mozilla.xpcom/src/org/mozilla/interfaces/nsIAccessibleImage.java 2010-06-16 09:39:59 UTC (rev 22829)
+++ workspace/mareshkau/xulrunner-1.9.2/org.mozilla.xpcom/src/org/mozilla/interfaces/nsIAccessibleImage.java 2010-06-16 11:09:58 UTC (rev 22830)
@@ -1,35 +0,0 @@
-/*
- * DO NOT EDIT. THIS FILE IS GENERATED FROM
- * /builds/slave/mozilla-1.9.2-linux-xulrunner/build/accessible/public/nsIAccessibleImage.idl
- */
-
-package org.mozilla.interfaces;
-
-/**
- *
- * @status UNDER_REVIEW
- */
-public interface nsIAccessibleImage extends nsISupports {
-
- String NS_IACCESSIBLEIMAGE_IID =
- "{09086623-0f09-4310-ac56-c2cda7c29648}";
-
- /**
- * Returns the coordinates of the image.
- *
- * @param coordType specifies coordinates origin (for available constants
- * refer to nsIAccessibleCoordinateType)
- * @param x the x coordinate
- * @param y the y coordinate
- */
- void getImagePosition(long coordType, int[] x, int[] y);
-
- /**
- * Returns the size of the image.
- *
- * @param width the heigth
- * @param height the width
- */
- void getImageSize(int[] width, int[] height);
-
-}
\ No newline at end of file
Deleted: workspace/mareshkau/xulrunner-1.9.2/org.mozilla.xpcom/src/org/mozilla/interfaces/nsIAccessibleProvider.java
===================================================================
--- workspace/mareshkau/xulrunner-1.9.2/org.mozilla.xpcom/src/org/mozilla/interfaces/nsIAccessibleProvider.java 2010-06-16 09:39:59 UTC (rev 22829)
+++ workspace/mareshkau/xulrunner-1.9.2/org.mozilla.xpcom/src/org/mozilla/interfaces/nsIAccessibleProvider.java 2010-06-16 11:09:58 UTC (rev 22830)
@@ -1,186 +0,0 @@
-/*
- * DO NOT EDIT. THIS FILE IS GENERATED FROM
- * /builds/slave/mozilla-1.9.2-linux-xulrunner/build/accessible/public/nsIAccessibleProvider.idl
- */
-
-package org.mozilla.interfaces;
-
-/**
- * nsIAccessibleProvider interface is used to link element and accessible
- object. For that XBL binding of element should implement the interface.
- */
-public interface nsIAccessibleProvider extends nsISupports {
-
- String NS_IACCESSIBLEPROVIDER_IID =
- "{3f7f9194-c625-4a85-8148-6d92d34897fa}";
-
- /**
- * Constants set of common use.
- */
-/** Do not create an accessible for this object
- * This is useful if an ancestor binding already implements nsIAccessibleProvider,
- * but no accessible is desired for the inheriting binding
- */
- int NoAccessible = 0;
-
- /** For elements that spawn a new document. For example now it is used by
- <xul:iframe>, <xul:browser> and <xul:editor>. */
- int OuterDoc = 1;
-
- /**
- * Constants set is used by XUL controls.
- */
- int XULAlert = 4097;
-
- int XULButton = 4098;
-
- int XULCheckbox = 4099;
-
- int XULColorPicker = 4100;
-
- int XULColorPickerTile = 4101;
-
- int XULCombobox = 4102;
-
- int XULDropmarker = 4103;
-
- int XULGroupbox = 4104;
-
- int XULImage = 4105;
-
- int XULLink = 4106;
-
- int XULListbox = 4107;
-
- int XULListCell = 4134;
-
- int XULListHead = 4132;
-
- int XULListHeader = 4133;
-
- int XULListitem = 4108;
-
- int XULMenubar = 4109;
-
- int XULMenuitem = 4110;
-
- int XULMenupopup = 4111;
-
- int XULMenuSeparator = 4112;
-
- int XULPane = 4113;
-
- int XULProgressMeter = 4114;
-
- int XULScale = 4115;
-
- int XULStatusBar = 4116;
-
- int XULRadioButton = 4117;
-
- int XULRadioGroup = 4118;
-
- /** The single tab in a dialog or tabbrowser/editor interface */
- int XULTab = 4119;
-
- /** A combination of a tabs object and a tabpanels object */
- int XULTabBox = 4120;
-
- /** The collection of tab objects, useable in the TabBox and independant of
- as well */
- int XULTabs = 4121;
-
- int XULText = 4122;
-
- int XULTextBox = 4123;
-
- int XULThumb = 4124;
-
- int XULTree = 4125;
-
- int XULTreeColumns = 4126;
-
- int XULTreeColumnItem = 4127;
-
- int XULToolbar = 4128;
-
- int XULToolbarSeparator = 4129;
-
- int XULTooltip = 4130;
-
- int XULToolbarButton = 4131;
-
- /**
- * Constants set is used by XForms elements.
- */
-/** Used for xforms elements that provide accessible object for itself as
- * well for anonymous content. This property are used for upload,
- * input[type="xsd:gDay"] and input[type="xsd:gMonth"] */
- int XFormsContainer = 8192;
-
- /** Used for label element */
- int XFormsLabel = 8193;
-
- /** Used for output element */
- int XFormsOuput = 8194;
-
- /** Used for trigger and submit elements */
- int XFormsTrigger = 8195;
-
- /** Used for input and textarea elements */
- int XFormsInput = 8196;
-
- /** Used for input[xsd:boolean] element */
- int XFormsInputBoolean = 8197;
-
- /** Used for input[xsd:date] element */
- int XFormsInputDate = 8198;
-
- /** Used for secret element */
- int XFormsSecret = 8199;
-
- /** Used for range element represented by slider */
- int XFormsSliderRange = 8200;
-
- /** Used for select and select1 that are implemented using host document's
- * native widget. For example, a select1 in a xhtml document may be
- * represented by the native html control html:select */
- int XFormsSelect = 8201;
-
- /** Used for xforms choices element */
- int XFormsChoices = 8208;
-
- /** Used for xforms full select/select1 elements that may be represented by
- * group of checkboxes and radiogroup */
- int XFormsSelectFull = 8209;
-
- /** Used for xforms item element that is used inside xforms select elements
- * represented by group of checkboxes */
- int XFormsItemCheckgroup = 8210;
-
- /** Used for xforms item element that is used inside xforms select1 elements
- * represented by radio group */
- int XFormsItemRadiogroup = 8211;
-
- /** Used for xforms select1 element that is represented by combobox */
- int XFormsSelectCombobox = 8212;
-
- /** Used for xforms item element that is used inside xforms select1
- * elements represented by combobox */
- int XFormsItemCombobox = 8213;
-
- /** Used for dropmarker widget that is used by xforms elements */
- int XFormsDropmarkerWidget = 8449;
-
- /** Used for calendar widget that is used by xforms elements */
- int XFormsCalendarWidget = 8450;
-
- /** Used for popup widget that is used by xforms minimal select1 elements */
- int XFormsComboboxPopupWidget = 8451;
-
- /**
- * Return one of constants declared above.
- */
- int getAccessibleType();
-
-}
\ No newline at end of file
Deleted: workspace/mareshkau/xulrunner-1.9.2/org.mozilla.xpcom/src/org/mozilla/interfaces/nsIAccessibleRelation.java
===================================================================
--- workspace/mareshkau/xulrunner-1.9.2/org.mozilla.xpcom/src/org/mozilla/interfaces/nsIAccessibleRelation.java 2010-06-16 09:39:59 UTC (rev 22829)
+++ workspace/mareshkau/xulrunner-1.9.2/org.mozilla.xpcom/src/org/mozilla/interfaces/nsIAccessibleRelation.java 2010-06-16 11:09:58 UTC (rev 22830)
@@ -1,134 +0,0 @@
-/*
- * DO NOT EDIT. THIS FILE IS GENERATED FROM
- * /builds/slave/mozilla-1.9.2-linux-xulrunner/build/accessible/public/nsIAccessibleRelation.idl
- */
-
-package org.mozilla.interfaces;
-
-/**
- * This interface gives access to an accessible's set of relations.
- * Be carefull, do not change constants until ATK has a structure to map gecko
- * constants into ATK constants.
- */
-public interface nsIAccessibleRelation extends nsISupports {
-
- String NS_IACCESSIBLERELATION_IID =
- "{f42a1589-70ab-4704-877f-4a9162bbe188}";
-
- long RELATION_NUL = 0L;
-
- /**
- * Some attribute of this object is affected by a target object.
- */
- long RELATION_CONTROLLED_BY = 1L;
-
- long RELATION_FIRST = 1L;
-
- /**
- * This object is interactive and controls some attribute of a target object.
- */
- long RELATION_CONTROLLER_FOR = 2L;
-
- /**
- * This object is label for a target object.
- */
- long RELATION_LABEL_FOR = 3L;
-
- /**
- * This object is labelled by a target object.
- */
- long RELATION_LABELLED_BY = 4L;
-
- /**
- * This object is a member of a group of one or more objects. When there is
- * more than one object in the group each member may have one and the same
- * target, e.g. a grouping object. It is also possible that each member has
- * multiple additional targets, e.g. one for every other member in the group.
- */
- long RELATION_MEMBER_OF = 5L;
-
- /**
- * This object is a child of a target object.
- */
- long RELATION_NODE_CHILD_OF = 6L;
-
- /**
- * Content flows from this object to a target object, i.e. has content that
- * flows logically to another object in a sequential way, e.g. text flow.
- */
- long RELATION_FLOWS_TO = 7L;
-
- /**
- * Content flows to this object from a target object, i.e. has content that
- * flows logically from another object in a sequential way, e.g. text flow.
- */
- long RELATION_FLOWS_FROM = 8L;
-
- /**
- * This object is a sub window of a target object.
- */
- long RELATION_SUBWINDOW_OF = 9L;
-
- /**
- * This object embeds a target object. This relation can be used on the
- * OBJID_CLIENT accessible for a top level window to show where the content
- * areas are.
- */
- long RELATION_EMBEDS = 10L;
-
- /**
- * This object is embedded by a target object.
- */
- long RELATION_EMBEDDED_BY = 11L;
-
- /**
- * This object is a transient component related to the target object. When
- * this object is activated the target object doesn't lose focus.
- */
- long RELATION_POPUP_FOR = 12L;
-
- /**
- * This object is a parent window of the target object.
- */
- long RELATION_PARENT_WINDOW_OF = 13L;
-
- /**
- * This object is described by the target object.
- */
- long RELATION_DESCRIBED_BY = 14L;
-
- /**
- * This object is describes the target object.
- */
- long RELATION_DESCRIPTION_FOR = 15L;
-
- long RELATION_LAST = 15L;
-
- /**
- * Part of a form/dialog with a related default button. It is used for
- * MSAA only, no for IA2 nor ATK.
- */
- long RELATION_DEFAULT_BUTTON = 16384L;
-
- /**
- * Returns the type of the relation.
- */
- long getRelationType();
-
- /**
- * Returns the number of targets for this relation.
- */
- long getTargetsCount();
-
- /**
- * Returns one accessible relation target.
- * @param index - 0 based index of relation target.
- */
- nsIAccessible getTarget(long index);
-
- /**
- * Returns multiple accessible relation targets.
- */
- nsIArray getTargets();
-
-}
\ No newline at end of file
Deleted: workspace/mareshkau/xulrunner-1.9.2/org.mozilla.xpcom/src/org/mozilla/interfaces/nsIAccessibleRetrieval.java
===================================================================
--- workspace/mareshkau/xulrunner-1.9.2/org.mozilla.xpcom/src/org/mozilla/interfaces/nsIAccessibleRetrieval.java 2010-06-16 09:39:59 UTC (rev 22829)
+++ workspace/mareshkau/xulrunner-1.9.2/org.mozilla.xpcom/src/org/mozilla/interfaces/nsIAccessibleRetrieval.java 2010-06-16 11:09:58 UTC (rev 22830)
@@ -1,136 +0,0 @@
-/*
- * DO NOT EDIT. THIS FILE IS GENERATED FROM
- * /builds/slave/mozilla-1.9.2-linux-xulrunner/build/accessible/public/nsIAccessibleRetrieval.idl
- */
-
-package org.mozilla.interfaces;
-
-/**
- * An interface for in-process accessibility clients
- * wishing to get an nsIAccessible or nsIAccessNode for
- * a given DOM node.
- * More documentation at:
- * http://www.mozilla.org/projects/ui/accessibility
- *
- * @status UNDER_REVIEW
- */
-public interface nsIAccessibleRetrieval extends nsISupports {
-
- String NS_IACCESSIBLERETRIEVAL_IID =
- "{244e4c67-a1d3-44f2-9cab-cdaa31b68046}";
-
- /**
- * Return an nsIAccessible for a DOM node in pres shell 0.
- * Create a new accessible of the appropriate type if necessary,
- * or use one from the accessibility cache if it already exists.
- * @param aNode The DOM node to get an accessible for.
- * @return The nsIAccessible for the given DOM node.
- */
- nsIAccessible getAccessibleFor(nsIDOMNode aNode);
-
- /**
- * The same like getAccessibleFor method except it returns accessible only if
- * it is attached, i.e. accessible is certified to be a descendent of the root
- * accessible.
- *
- * @param aNode - the DOM node to get an accessible for.
- *
- * @return - the accessible for the given DOM node.
- */
- nsIAccessible getAttachedAccessibleFor(nsIDOMNode aNode);
-
- /**
- * Return an DOM node that is relevant to attached accesible check. This
- * node is either from bindings chain if given node is anonymous and owner
- * binding denies accessible in anonymous content or given node (it's not
- * important whether it is accessible or not). This method doesn't create
- * accessible object for returned node.
- *
- * @param aNode - the DOM node to get relevant content node.
- *
- * @return - the DOM node for parent attached accessible
- */
- nsIDOMNode getRelevantContentNodeFor(nsIDOMNode aNode);
-
- /**
- * Return an nsIAccessible for a DOM node in pres shell for this DOM window.
- * Create a new accessible of the appropriate type if necessary,
- * or use one from the accessibility cache if it already exists.
- * @param aNode The DOM node to get an accessible for.
- * @param aDOMWin The DOM window containing the node.
- * @return The nsIAccessible for the given DOM node.
- */
- nsIAccessible getAccessibleInWindow(nsIDOMNode aNode, nsIDOMWindow aDOMWin);
-
- /**
- * Return an nsIAccessible for a DOM node in the given weak shell.
- * Create a new accessible of the appropriate type if necessary,
- * or use one from the accessibility cache if it already exists.
- * @param aNode The DOM node to get an accessible for.
- * @param aPresShell The presentation shell which contains layout info for the DOM node.
- * @return The nsIAccessible for the given DOM node.
- */
- nsIAccessible getAccessibleInWeakShell(nsIDOMNode aNode, nsISupports aPresShell);
-
- /**
- * Return an nsIAccessible for a DOM node in the given pres shell.
- * Create a new accessible of the appropriate type if necessary,
- * or use one from the accessibility cache if it already exists.
- * @param aNode The DOM node to get an accessible for.
- * @param aPresShell The presentation shell which contains layout info for the DOM node.
- * @return The nsIAccessible for the given DOM node.
- */
- nsIAccessible getAccessibleInShell(nsIDOMNode aNode, nsISupports aPresShell);
-
- /**
- * Return an nsIAccessNode for an already created DOM node in the given weak shell.
- * Does not create a new one -- only returns cached access nodes.
- * @param aNode The DOM node to get an access node for.
- * @param aPresShell The presentation shell which contains layout info for the DOM node.
- * @return The nsIAccessNode for the given DOM node or null if
- * an access node does not already exist for this DOM node.
- */
- nsIAccessNode getCachedAccessNode(nsIDOMNode aNode, nsISupports aShell);
-
- /**
- * Return an nsIAccessible for an already created DOM node in the given weak shell.
- * Does not create a new one -- only returns cached accessibles.
- * @param aNode The DOM node to get an accessible for.
- * @param aPresShell The presentation shell which contains layout info for the DOM node.
- * @return The nsIAccessible for the given DOM node or null if
- * an accessible does not already exist for this DOM node.
- */
- nsIAccessible getCachedAccessible(nsIDOMNode aNode, nsISupports aShell);
-
- /**
- * Returns accessible role as a string.
- *
- * @param aRole - the accessible role constants.
- */
- String getStringRole(long aRole);
-
- /**
- * Returns list which contains accessible states as a strings.
- *
- * @param aStates - accessible states.
- * @param aExtraStates - accessible extra states.
- */
- nsIDOMDOMStringList getStringStates(long aStates, long aExtraStates);
-
- /**
- * Get the type of accessible event as a string.
- *
- * @param aEventType - the accessible event type constant
- * @return - accessible event type presented as human readable string
- */
- String getStringEventType(long aEventType);
-
- /**
- * Get the type of accessible relation as a string.
- *
- * @param aRelationType - the accessible relation type constant
- * @return - accessible relation type presented as human readable string
- */
- String getStringRelationType(long aRelationType);
-
-}
\ No newline at end of file
Deleted: workspace/mareshkau/xulrunner-1.9.2/org.mozilla.xpcom/src/org/mozilla/interfaces/nsIAccessibleRole.java
===================================================================
--- workspace/mareshkau/xulrunner-1.9.2/org.mozilla.xpcom/src/org/mozilla/interfaces/nsIAccessibleRole.java 2010-06-16 09:39:59 UTC (rev 22829)
+++ workspace/mareshkau/xulrunner-1.9.2/org.mozilla.xpcom/src/org/mozilla/interfaces/nsIAccessibleRole.java 2010-06-16 11:09:58 UTC (rev 22830)
@@ -1,754 +0,0 @@
-/*
- * DO NOT EDIT. THIS FILE IS GENERATED FROM
- * /builds/slave/mozilla-1.9.2-linux-xulrunner/build/accessible/public/nsIAccessibleRole.idl
- */
-
-package org.mozilla.interfaces;
-
-/**
- * Defines cross platform (Gecko) roles.
- *
- * @note - When adding a new role, be sure to also add it to nsRoleMap.h for
- * each platform.
- */
-public interface nsIAccessibleRole extends nsISupports {
-
- String NS_IACCESSIBLEROLE_IID =
- "{6793ca5c-c7cb-41db-9fb9-c16c0525f962}";
-
- /**
- * Used when accessible hans't strong defined role.
- */
- long ROLE_NOTHING = 0L;
-
- /**
- * Represents a title or caption bar for a window. It is used by MSAA only,
- * supported automatically by MS Windows.
- */
- long ROLE_TITLEBAR = 1L;
-
- /**
- * Represents the menu bar (positioned beneath the title bar of a window)
- * from which menus are selected by the user. The role is used by
- * xul:menubar or role="menubar".
- */
- long ROLE_MENUBAR = 2L;
-
- /**
- * Represents a vertical or horizontal scroll bar, which is part of the client
- * area or used in a control.
- */
- long ROLE_SCROLLBAR = 3L;
-
- /**
- * Represents a special mouse pointer, which allows a user to manipulate user
- * interface elements such as windows. For example, a user clicks and drags
- * a sizing grip in the lower-right corner of a window to resize it.
- */
- long ROLE_GRIP = 4L;
-
- /**
- * Represents a system sound, which is associated with various system events.
- */
- long ROLE_SOUND = 5L;
-
- /**
- * Represents the system mouse pointer.
- */
- long ROLE_CURSOR = 6L;
-
- /**
- * Represents the system caret. The role is supported for caret.
- */
- long ROLE_CARET = 7L;
-
- /**
- * Represents an alert or a condition that a user should be notified about.
- * Assistive Technologies typically respond to the role by reading the entire
- * onscreen contents of containers advertising this role. Should be used for
- * warning dialogs, etc. The role is used by xul:browsermessage,
- * role="alert", xforms:message.
- */
- long ROLE_ALERT = 8L;
-
- /**
- * Represents the window frame, which contains child objects such as
- * a title bar, client, and other objects contained in a window. The role
- * is supported automatically by MS Windows.
- */
- long ROLE_WINDOW = 9L;
-
- /**
- * A sub-document (<frame> or <iframe>)
- */
- long ROLE_INTERNAL_FRAME = 10L;
-
- /**
- * Represents a menu, which presents a list of options from which the user can
- * make a selection to perform an action. It is used for role="menu".
- */
- long ROLE_MENUPOPUP = 11L;
-
- /**
- * Represents a menu item, which is an entry in a menu that a user can choose
- * to carry out a command, select an option. It is used for xul:menuitem,
- * role="menuitem".
- */
- long ROLE_MENUITEM = 12L;
-
- /**
- * Represents a ToolTip that provides helpful hints.
- */
- long ROLE_TOOLTIP = 13L;
-
- /**
- * Represents a main window for an application. It is used for
- * role="application". Also refer to ROLE_APP_ROOT
- */
- long ROLE_APPLICATION = 14L;
-
- /**
- * Represents a document window. A document window is always contained within
- * an application window. It is used for role="document".
- */
- long ROLE_DOCUMENT = 15L;
-
- /**
- * Represents a pane within a frame or document window. Users can navigate
- * between panes and within the contents of the current pane, but cannot
- * navigate between items in different panes. Thus, panes represent a level
- * of grouping lower than frame windows or documents, but above individual
- * controls. It is used for the first child of a <frame> or <iframe>.
- */
- long ROLE_PANE = 16L;
-
- /**
- * Represents a graphical image used to represent data.
- */
- long ROLE_CHART = 17L;
-
- /**
- * Represents a dialog box or message box. It is used for xul:dialog,
- * role="dialog".
- */
- long ROLE_DIALOG = 18L;
-
- /**
- * Represents a window border.
- */
- long ROLE_BORDER = 19L;
-
- /**
- * Logically groups other objects. There is not always a parent-child
- * relationship between the grouping object and the objects it contains. It
- * is used for html:textfield, xul:groupbox, role="group".
- */
- long ROLE_GROUPING = 20L;
-
- /**
- * Used to visually divide a space into two regions, such as a separator menu
- * item or a bar that divides split panes within a window. It is used for
- * xul:separator, html:hr, role="separator".
- */
- long ROLE_SEPARATOR = 21L;
-
- /**
- * Represents a toolbar, which is a grouping of controls (push buttons or
- * toggle buttons) that provides easy access to frequently used features. It
- * is used for xul:toolbar, role="toolbar".
- */
- long ROLE_TOOLBAR = 22L;
-
- /**
- * Represents a status bar, which is an area at the bottom of a window that
- * displays information about the current operation, state of the application,
- * or selected object. The status bar has multiple fields, which display
- * different kinds of information. It is used for xul:statusbar.
- */
- long ROLE_STATUSBAR = 23L;
-
- /**
- * Represents a table that contains rows and columns of cells, and optionally,
- * row headers and column headers. It is used for html:table,
- * role="grid". Also refer to the following roles: ROLE_COLUMNHEADER,
- * ROLE_ROWHEADER, ROLE_COLUMN, ROLE_ROW, ROLE_CELL.
- */
- long ROLE_TABLE = 24L;
-
- /**
- * Represents a column header, providing a visual label for a column in
- * a table. It is used for XUL tree column headers, html:th,
- * role="colheader". Also refer to ROLE_TABLE.
- */
- long ROLE_COLUMNHEADER = 25L;
-
- /**
- * Represents a row header, which provides a visual label for a table row.
- * It is used for role="rowheader". Also, see ROLE_TABLE.
- */
- long ROLE_ROWHEADER = 26L;
-
- /**
- * Represents a column of cells within a table. Also, see ROLE_TABLE.
- */
- long ROLE_COLUMN = 27L;
-
- /**
- * Represents a row of cells within a table. Also, see ROLE_TABLE.
- */
- long ROLE_ROW = 28L;
-
- /**
- * Represents a cell within a table. It is used for html:td,
- * xul:tree cell and xul:listcell. Also, see ROLE_TABLE.
- */
- long ROLE_CELL = 29L;
-
- /**
- * Represents a link to something else. This object might look like text or
- * a graphic, but it acts like a button. It is used for
- * xul:label@class="text-link", html:a, html:area,
- * xforms:trigger@appearance="minimal".
- */
- long ROLE_LINK = 30L;
-
- /**
- * Displays a Help topic in the form of a ToolTip or Help balloon.
- */
- long ROLE_HELPBALLOON = 31L;
-
- /**
- * Represents a cartoon-like graphic object, such as Microsoft Office
- * Assistant, which is displayed to provide help to users of an application.
- */
- long ROLE_CHARACTER = 32L;
-
- /**
- * Represents a list box, allowing the user to select one or more items. It
- * is used for xul:listbox, html:select@size, role="list". See also
- * ROLE_LIST_ITEM.
- */
- long ROLE_LIST = 33L;
-
- /**
- * Represents an item in a list. See also ROLE_LIST.
- */
- long ROLE_LISTITEM = 34L;
-
- /**
- * Represents an outline or tree structure, such as a tree view control,
- * that displays a hierarchical list and allows the user to expand and
- * collapse branches. Is is used for role="tree".
- */
- long ROLE_OUTLINE = 35L;
-
- /**
- * Represents an item in an outline or tree structure. It is used for
- * role="treeitem".
- */
- long ROLE_OUTLINEITEM = 36L;
-
- /**
- * Represents a page tab, it is a child of a page tab list. It is used for
- * xul:tab, role="treeitem". Also refer to ROLE_PAGETABLIST.
- */
- long ROLE_PAGETAB = 37L;
-
- /**
- * Represents a property sheet. It is used for xul:tabpanel,
- * role="tabpanel".
- */
- long ROLE_PROPERTYPAGE = 38L;
-
- /**
- * Represents an indicator, such as a pointer graphic, that points to the
- * current item.
- */
- long ROLE_INDICATOR = 39L;
-
- /**
- * Represents a picture. Is is used for xul:image, html:img.
- */
- long ROLE_GRAPHIC = 40L;
-
- /**
- * Represents read-only text, such as labels for other controls or
- * instructions in a dialog box. Static text cannot be modified or selected.
- * Is is used for xul:label, xul:description, html:label, role="label",
- * or xforms:output.
- */
- long ROLE_STATICTEXT = 41L;
-
- /**
- * Represents selectable text that allows edits or is designated read-only.
- */
- long ROLE_TEXT_LEAF = 42L;
-
- /**
- * Represents a push button control. It is used for xul:button, html:button,
- * role="button", xforms:trigger, xforms:submit.
- */
- long ROLE_PUSHBUTTON = 43L;
-
- /**
- * Represents a check box control. It is used for xul:checkbox,
- * html:input@type="checkbox", role="checkbox", boolean xforms:input.
- */
- long ROLE_CHECKBUTTON = 44L;
-
- /**
- * Represents an option button, also called a radio button. It is one of a
- * group of mutually exclusive options. All objects sharing a single parent
- * that have this attribute are assumed to be part of single mutually
- * exclusive group. It is used for xul:radio, html:input@type="radio",
- * role="radio".
- */
- long ROLE_RADIOBUTTON = 45L;
-
- /**
- * Represents a combo box; an edit control with an associated list box that
- * provides a set of predefined choices. It is used for html:select,
- * xul:menulist, role="combobox".
- */
- long ROLE_COMBOBOX = 46L;
-
- /**
- * Represents the calendar control. It is used for date xforms:input.
- */
- long ROLE_DROPLIST = 47L;
-
- /**
- * Represents a progress bar, dynamically showing the user the percent
- * complete of an operation in progress. It is used for xul:progressmeter,
- * role="progressbar".
- */
- long ROLE_PROGRESSBAR = 48L;
-
- /**
- * Represents a dial or knob whose purpose is to allow a user to set a value.
- */
- long ROLE_DIAL = 49L;
-
- /**
- * Represents a hot-key field that allows the user to enter a combination or
- * sequence of keystrokes.
- */
- long ROLE_HOTKEYFIELD = 50L;
-
- /**
- * Represents a slider, which allows the user to adjust a setting in given
- * increments between minimum and maximum values. It is used by xul:scale,
- * role="slider", xforms:range.
- */
- long ROLE_SLIDER = 51L;
-
- /**
- * Represents a spin box, which is a control that allows the user to increment
- * or decrement the value displayed in a separate "buddy" control associated
- * with the spin box. It is used for xul:spinbuttons.
- */
- long ROLE_SPINBUTTON = 52L;
-
- /**
- * Represents a graphical image used to diagram data. It is used for svg:svg.
- */
- long ROLE_DIAGRAM = 53L;
-
- /**
- * Represents an animation control, which contains content that changes over
- * time, such as a control that displays a series of bitmap frames.
- */
- long ROLE_ANIMATION = 54L;
-
- /**
- * Represents a mathematical equation. It is used by MATHML, where there is a
- * rich DOM subtree for an equation. Use ROLE_FLAT_EQUATION for <img role="math" alt="[TeX]"/>
- */
- long ROLE_EQUATION = 55L;
-
- /**
- * Represents a button that drops down a list of items.
- */
- long ROLE_BUTTONDROPDOWN = 56L;
-
- /**
- * Represents a button that drops down a menu.
- */
- long ROLE_BUTTONMENU = 57L;
-
- /**
- * Represents a button that drops down a grid. It is used for xul:colorpicker.
- */
- long ROLE_BUTTONDROPDOWNGRID = 58L;
-
- /**
- * Represents blank space between other objects.
- */
- long ROLE_WHITESPACE = 59L;
-
- /**
- * Represents a container of page tab controls. Is it used for xul:tabs,
- * DHTML: role="tabs". Also refer to ROLE_PAGETAB.
- */
- long ROLE_PAGETABLIST = 60L;
-
- /**
- * Represents a control that displays time.
- */
- long ROLE_CLOCK = 61L;
-
- /**
- * Represents a button on a toolbar that has a drop-down list icon directly
- * adjacent to the button.
- */
- long ROLE_SPLITBUTTON = 62L;
-
- /**
- * Represents an edit control designed for an Internet Protocol (IP) address.
- * The edit control is divided into sections for the different parts of the
- * IP address.
- */
- long ROLE_IPADDRESS = 63L;
-
- /**
- * Represents a label control that has an accelerator.
- */
- long ROLE_ACCEL_LABEL = 64L;
-
- /**
- * Represents an arrow in one of the four cardinal directions.
- */
- long ROLE_ARROW = 65L;
-
- /**
- * Represents a control that can be drawn into and is used to trap events.
- * It is used for html:canvas.
- */
- long ROLE_CANVAS = 66L;
-
- /**
- * Represents a menu item with a check box.
- */
- long ROLE_CHECK_MENU_ITEM = 67L;
-
- /**
- * Represents a specialized dialog that lets the user choose a color.
- */
- long ROLE_COLOR_CHOOSER = 68L;
-
- /**
- * Represents control whose purpose is to allow a user to edit a date.
- */
- long ROLE_DATE_EDITOR = 69L;
-
- /**
- * An iconified internal frame in an ROLE_DESKTOP_PANE. Also refer to
- * ROLE_INTERNAL_FRAME.
- */
- long ROLE_DESKTOP_ICON = 70L;
-
- /**
- * A desktop pane. A pane that supports internal frames and iconified
- * versions of those internal frames.
- */
- long ROLE_DESKTOP_FRAME = 71L;
-
- /**
- * A directory pane. A pane that allows the user to navigate through
- * and select the contents of a directory. May be used by a file chooser.
- * Also refer to ROLE_FILE_CHOOSER.
- */
- long ROLE_DIRECTORY_PANE = 72L;
-
- /**
- * A file chooser. A specialized dialog that displays the files in the
- * directory and lets the user select a file, browse a different directory,
- * or specify a filename. May use the directory pane to show the contents of
- * a directory. Also refer to ROLE_DIRECTORY_PANE.
- */
- long ROLE_FILE_CHOOSER = 73L;
-
- /**
- * A font chooser. A font chooser is a component that lets the user pick
- * various attributes for fonts.
- */
- long ROLE_FONT_CHOOSER = 74L;
-
- /**
- * Frame role. A top level window with a title bar, border, menu bar, etc.
- * It is often used as the primary window for an application.
- */
- long ROLE_CHROME_WINDOW = 75L;
-
- /**
- * A glass pane. A pane that is guaranteed to be painted on top of all
- * panes beneath it. Also refer to ROLE_ROOT_PANE.
- */
- long ROLE_GLASS_PANE = 76L;
-
- /**
- * A document container for HTML, whose children represent the document
- * content.
- */
- long ROLE_HTML_CONTAINER = 77L;
-
- /**
- * A small fixed size picture, typically used to decorate components.
- */
- long ROLE_ICON = 78L;
-
- /**
- * Presents an icon or short string in an interface.
- */
- long ROLE_LABEL = 79L;
-
- /**
- * A layered pane. A specialized pane that allows its children to be drawn
- * in layers, providing a form of stacking order. This is usually the pane
- * that holds the menu bar as well as the pane that contains most of the
- * visual components in a window. Also refer to ROLE_GLASS_PANE and
- * ROLE_ROOT_PANE.
- */
- long ROLE_LAYERED_PANE = 80L;
-
- /**
- * A specialized pane whose primary use is inside a dialog.
- */
- long ROLE_OPTION_PANE = 81L;
-
- /**
- * A text object uses for passwords, or other places where the text content
- * is not shown visibly to the user.
- */
- long ROLE_PASSWORD_TEXT = 82L;
-
- /**
- * A temporary window that is usually used to offer the user a list of
- * choices, and then hides when the user selects one of those choices.
- */
- long ROLE_POPUP_MENU = 83L;
-
- /**
- * A radio button that is a menu item.
- */
- long ROLE_RADIO_MENU_ITEM = 84L;
-
- /**
- * A root pane. A specialized pane that has a glass pane and a layered pane
- * as its children. Also refer to ROLE_GLASS_PANE and ROLE_LAYERED_PANE.
- */
- long ROLE_ROOT_PANE = 85L;
-
- /**
- * A scroll pane. An object that allows a user to incrementally view a large
- * amount of information. Its children can include scroll bars and a
- * viewport. Also refer to ROLE_VIEW_PORT.
- */
- long ROLE_SCROLL_PANE = 86L;
-
- /**
- * A split pane. A specialized panel that presents two other panels at the
- * same time. Between the two panels is a divider the user can manipulate to
- * make one panel larger and the other panel smaller.
- */
- long ROLE_SPLIT_PANE = 87L;
-
- /**
- * The header for a column of a table.
- * XXX: it looks this role is dupe of ROLE_COLUMNHEADER.
- */
- long ROLE_TABLE_COLUMN_HEADER = 88L;
-
- /**
- * The header for a row of a table.
- * XXX: it looks this role is dupe of ROLE_ROWHEADER
- */
- long ROLE_TABLE_ROW_HEADER = 89L;
-
- /**
- * A menu item used to tear off and reattach its menu.
- */
- long ROLE_TEAR_OFF_MENU_ITEM = 90L;
-
- /**
- * Represents an accessible terminal.
- */
- long ROLE_TERMINAL = 91L;
-
- /**
- * Collection of objects that constitute a logical text entity.
- */
- long ROLE_TEXT_CONTAINER = 92L;
-
- /**
- * A toggle button. A specialized push button that can be checked or
- * unchecked, but does not provide a separate indicator for the current state.
- */
- long ROLE_TOGGLE_BUTTON = 93L;
-
- /**
- * Representas a control that is capable of expanding and collapsing rows as
- * well as showing multiple columns of data.
- * XXX: it looks like this role is dupe of ROLE_OUTLINE.
- */
- long ROLE_TREE_TABLE = 94L;
-
- /**
- * A viewport. An object usually used in a scroll pane. It represents the
- * portion of the entire data that the user can see. As the user manipulates
- * the scroll bars, the contents of the viewport can change. Also refer to
- * ROLE_SCROLL_PANE.
- */
- long ROLE_VIEWPORT = 95L;
-
- /**
- * Header of a document page. Also refer to ROLE_FOOTER.
- */
- long ROLE_HEADER = 96L;
-
- /**
- * Footer of a document page. Also refer to ROLE_HEADER.
- */
- long ROLE_FOOTER = 97L;
-
- /**
- * A paragraph of text.
- */
- long ROLE_PARAGRAPH = 98L;
-
- /**
- * A ruler such as those used in word processors.
- */
- long ROLE_RULER = 99L;
-
- /**
- * A text entry having dialog or list containing items for insertion into
- * an entry widget, for instance a list of words for completion of a
- * text entry. It is used for xul:textbox@autocomplete
- */
- long ROLE_AUTOCOMPLETE = 100L;
-
- /**
- * An editable text object in a toolbar.
- */
- long ROLE_EDITBAR = 101L;
-
- /**
- * An control whose textual content may be entered or modified by the user.
- */
- long ROLE_ENTRY = 102L;
-
- /**
- * A caption describing another object.
- */
- long ROLE_CAPTION = 103L;
-
- /**
- * A visual frame or container which contains a view of document content.
- * Document frames may occur within another Document instance, in which case
- * the second document may be said to be embedded in the containing instance.
- * HTML frames are often ROLE_DOCUMENT_FRAME. Either this object, or a
- * singleton descendant, should implement the Document interface.
- */
- long ROLE_DOCUMENT_FRAME = 104L;
-
- /**
- * Heading.
- */
- long ROLE_HEADING = 105L;
-
- /**
- * An object representing a page of document content. It is used in documents
- * which are accessed by the user on a page by page basis.
- */
- long ROLE_PAGE = 106L;
-
- /**
- * A container of document content. An example of the use of this role is to
- * represent an html:div.
- */
- long ROLE_SECTION = 107L;
-
- /**
- * An object which is redundant with another object in the accessible
- * hierarchy. ATs typically ignore objects with this role.
- */
- long ROLE_REDUNDANT_OBJECT = 108L;
-
- /**
- * A container of form controls. An example of the use of this role is to
- * represent an html:form.
- */
- long ROLE_FORM = 109L;
-
- /**
- * An object which is used to allow input of characters not found on a
- * keyboard, such as the input of Chinese characters on a Western keyboard.
- */
- long ROLE_IME = 110L;
-
- /**
- * XXX: document this.
- */
- long ROLE_APP_ROOT = 111L;
-
- /**
- * Represents a menu item, which is an entry in a menu that a user can choose
- * to display another menu.
- */
- long ROLE_PARENT_MENUITEM = 112L;
-
- /**
- * A calendar that allows the user to select a date.
- */
- long ROLE_CALENDAR = 113L;
-
- /**
- * A list of items that is shown by combobox.
- */
- long ROLE_COMBOBOX_LIST = 114L;
-
- /**
- * A item of list that is shown by combobox;
- */
- long ROLE_COMBOBOX_OPTION = 115L;
-
- /**
- * An image map -- has child links representing the areas
- */
- long ROLE_IMAGE_MAP = 116L;
-
- /**
- * An option in a listbox
- */
- long ROLE_OPTION = 117L;
-
- /**
- * A rich option in a listbox, it can have other widgets as children
- */
- long ROLE_RICH_OPTION = 118L;
-
- /**
- * A list of options
- */
- long ROLE_LISTBOX = 119L;
-
- /**
- * Represents a mathematical equation in the accessible name
- */
- long ROLE_FLAT_EQUATION = 120L;
-
- /**
- * Represents a cell within a grid. It is used for role="gridcell". Unlike
- * ROLE_CELL, it allows the calculation of the accessible name from subtree.
- * Also, see ROLE_TABLE.
- */
- long ROLE_GRID_CELL = 121L;
-
- /**
- * It's not role actually. This constant is important to help ensure
- * nsRoleMap's are synchronized.
- */
- long ROLE_LAST_ENTRY = 122L;
-
-}
\ No newline at end of file
Deleted: workspace/mareshkau/xulrunner-1.9.2/org.mozilla.xpcom/src/org/mozilla/interfaces/nsIAccessibleScrollType.java
===================================================================
--- workspace/mareshkau/xulrunner-1.9.2/org.mozilla.xpcom/src/org/mozilla/interfaces/nsIAccessibleScrollType.java 2010-06-16 09:39:59 UTC (rev 22829)
+++ workspace/mareshkau/xulrunner-1.9.2/org.mozilla.xpcom/src/org/mozilla/interfaces/nsIAccessibleScrollType.java 2010-06-16 11:09:58 UTC (rev 22830)
@@ -1,59 +0,0 @@
-/*
- * DO NOT EDIT. THIS FILE IS GENERATED FROM
- * /builds/slave/mozilla-1.9.2-linux-xulrunner/build/accessible/public/nsIAccessibleTypes.idl
- */
-
-package org.mozilla.interfaces;
-
-/**
- * These constants control the scrolling of an object or substring into a
- * window. Note, keep them synchronized with IA2ScrollType.
- */
-public interface nsIAccessibleScrollType extends nsISupports {
-
- String NS_IACCESSIBLESCROLLTYPE_IID =
- "{05cd38b1-94b3-4cdf-8371-3935a9611405}";
-
- /**
- * Scroll the top left of the object or substring to the top left of the
- * window (or as close as possible).
- */
- long SCROLL_TYPE_TOP_LEFT = 0L;
-
- /**
- * Scroll the bottom right of the object or substring to the bottom right of
- * the window (or as close as possible).
- */
- long SCROLL_TYPE_BOTTOM_RIGHT = 1L;
-
- /**
- * Scroll the top edge of the object or substring to the top edge of the
- * window (or as close as possible).
- */
- long SCROLL_TYPE_TOP_EDGE = 2L;
-
- /**
- * Scroll the bottom edge of the object or substring to the bottom edge of
- * the window (or as close as possible).
- */
- long SCROLL_TYPE_BOTTOM_EDGE = 3L;
-
- /**
- * Scroll the left edge of the object or substring to the left edge of the
- * window (or as close as possible).
- */
- long SCROLL_TYPE_LEFT_EDGE = 4L;
-
- /**
- * Scroll the right edge of the object or substring to the right edge of the
- * window (or as close as possible).
- */
- long SCROLL_TYPE_RIGHT_EDGE = 5L;
-
- /**
- * Scroll an object the minimum amount necessary in order for the entire
- * frame to be visible (if possible).
- */
- long SCROLL_TYPE_ANYWHERE = 6L;
-
-}
\ No newline at end of file
Deleted: workspace/mareshkau/xulrunner-1.9.2/org.mozilla.xpcom/src/org/mozilla/interfaces/nsIAccessibleSelectable.java
===================================================================
--- workspace/mareshkau/xulrunner-1.9.2/org.mozilla.xpcom/src/org/mozilla/interfaces/nsIAccessibleSelectable.java 2010-06-16 09:39:59 UTC (rev 22829)
+++ workspace/mareshkau/xulrunner-1.9.2/org.mozilla.xpcom/src/org/mozilla/interfaces/nsIAccessibleSelectable.java 2010-06-16 11:09:58 UTC (rev 22830)
@@ -1,78 +0,0 @@
-/*
- * DO NOT EDIT. THIS FILE IS GENERATED FROM
- * /builds/slave/mozilla-1.9.2-linux-xulrunner/build/accessible/public/nsIAccessibleSelectable.idl
- */
-
-package org.mozilla.interfaces;
-
-/**
- * An interface for the accessibility module and in-process accessibility clients
- * for dealing with getting and changing the selection of accessible nodes.
- *
- * @status UNDER_REVIEW
- */
-public interface nsIAccessibleSelectable extends nsISupports {
-
- String NS_IACCESSIBLESELECTABLE_IID =
- "{34d268d6-1dd2-11b2-9d63-83a5e0ada290}";
-
- long eSelection_Add = 0L;
-
- long eSelection_Remove = 1L;
-
- long eSelection_GetState = 2L;
-
- /**
- * Return an nsIArray of selected nsIAccessible children
- */
- nsIArray getSelectedChildren();
-
- /**
- * Returns the number of accessible children currently selected.
- */
- int getSelectionCount();
-
- /**
- * Adds the specified accessible child of the object to the
- * object's selection.
- * If the specified object is already selected, then it does nothing.
- * @throws NS_ERROR_FAILURE if the specified object is not selectable.
- */
- void addChildToSelection(int index);
-
- /**
- * Removes the specified child of the object from the object's selection.
- * If the specified object was not selected, then it does nothing.
- * @throws NS_ERROR_FAILURE if the specified object is not selectable.
- */
- void removeChildFromSelection(int index);
-
- /**
- * Clears the selection in the object so that no children in the object
- * are selected.
- */
- void clearSelection();
-
- /**
- * Returns a reference to the accessible object representing the specified
- * selected child of the object.
- * @param index Zero-based selected accessible child index
- * @return The nth selected accessible child
- */
- nsIAccessible refSelection(int index);
-
- /**
- * Determines if the current child of this object is selected
- * @param The zero-based accessible child index
- * @return Returns true if the child is selected, false if not.
- */
- boolean isChildSelected(int index);
-
- /**
- * Select all children
- * @return If the object does not accept multiple selection, return false.
- * Otherwise, returns true.
- */
- boolean selectAllSelection();
-
-}
\ No newline at end of file
Deleted: workspace/mareshkau/xulrunner-1.9.2/org.mozilla.xpcom/src/org/mozilla/interfaces/nsIAccessibleStateChangeEvent.java
===================================================================
--- workspace/mareshkau/xulrunner-1.9.2/org.mozilla.xpcom/src/org/mozilla/interfaces/nsIAccessibleStateChangeEvent.java 2010-06-16 09:39:59 UTC (rev 22829)
+++ workspace/mareshkau/xulrunner-1.9.2/org.mozilla.xpcom/src/org/mozilla/interfaces/nsIAccessibleStateChangeEvent.java 2010-06-16 11:09:58 UTC (rev 22830)
@@ -1,29 +0,0 @@
-/*
- * DO NOT EDIT. THIS FILE IS GENERATED FROM
- * /builds/slave/mozilla-1.9.2-linux-xulrunner/build/accessible/public/nsIAccessibleEvent.idl
- */
-
-package org.mozilla.interfaces;
-
-public interface nsIAccessibleStateChangeEvent extends nsIAccessibleEvent {
-
- String NS_IACCESSIBLESTATECHANGEEVENT_IID =
- "{444db51a-05fd-4576-8a64-32dbb2a83884}";
-
- /**
- * Returns the state of accessible (see constants declared
- * in nsIAccessibleStates).
- */
- long getState();
-
- /**
- * Returns true if the state is extra state.
- */
- boolean isExtraState();
-
- /**
- * Returns true if the state is turned on.
- */
- boolean isEnabled();
-
-}
\ No newline at end of file
Deleted: workspace/mareshkau/xulrunner-1.9.2/org.mozilla.xpcom/src/org/mozilla/interfaces/nsIAccessibleStates.java
===================================================================
--- workspace/mareshkau/xulrunner-1.9.2/org.mozilla.xpcom/src/org/mozilla/interfaces/nsIAccessibleStates.java 2010-06-16 09:39:59 UTC (rev 22829)
+++ workspace/mareshkau/xulrunner-1.9.2/org.mozilla.xpcom/src/org/mozilla/interfaces/nsIAccessibleStates.java 2010-06-16 11:09:58 UTC (rev 22830)
@@ -1,122 +0,0 @@
-/*
- * DO NOT EDIT. THIS FILE IS GENERATED FROM
- * /builds/slave/mozilla-1.9.2-linux-xulrunner/build/accessible/public/nsIAccessibleStates.idl
- */
-
-package org.mozilla.interfaces;
-
-public interface nsIAccessibleStates extends nsISupports {
-
- String NS_IACCESSIBLESTATES_IID =
- "{7fe1ee90-edaa-43f1-9f3b-071099b51f08}";
-
- /**
- * MSAA State flags - used for bitfield. More than 1 allowed.
- */
- long STATE_UNAVAILABLE = 1L;
-
- long STATE_SELECTED = 2L;
-
- long STATE_FOCUSED = 4L;
-
- long STATE_PRESSED = 8L;
-
- long STATE_CHECKED = 16L;
-
- long STATE_MIXED = 32L;
-
- long STATE_READONLY = 64L;
-
- long STATE_HOTTRACKED = 128L;
-
- long STATE_DEFAULT = 256L;
-
- long STATE_EXPANDED = 512L;
-
- long STATE_COLLAPSED = 1024L;
-
- long STATE_BUSY = 2048L;
-
- long STATE_FLOATING = 4096L;
-
- long STATE_MARQUEED = 8192L;
-
- long STATE_ANIMATED = 16384L;
-
- long STATE_INVISIBLE = 32768L;
-
- long STATE_OFFSCREEN = 65536L;
-
- long STATE_SIZEABLE = 131072L;
-
- long STATE_MOVEABLE = 262144L;
-
- long STATE_SELFVOICING = 524288L;
-
- long STATE_FOCUSABLE = 1048576L;
-
- long STATE_SELECTABLE = 2097152L;
-
- long STATE_LINKED = 4194304L;
-
- long STATE_TRAVERSED = 8388608L;
-
- long STATE_MULTISELECTABLE = 16777216L;
-
- long STATE_EXTSELECTABLE = 33554432L;
-
- long STATE_ALERT_LOW = 67108864L;
-
- long STATE_ALERT_MEDIUM = 134217728L;
-
- long STATE_ALERT_HIGH = 268435456L;
-
- long STATE_PROTECTED = 536870912L;
-
- long STATE_HASPOPUP = 1073741824L;
-
- long STATE_REQUIRED = 67108864L;
-
- long STATE_IMPORTANT = 134217728L;
-
- long STATE_INVALID = 268435456L;
-
- long STATE_CHECKABLE = 8192L;
-
- /**
- * Extended state flags (for now non-MSAA, for Java and Gnome/ATK support)
- * "Extended state flags" has separate value space from "MSAA State flags".
- */
- long EXT_STATE_SUPPORTS_AUTOCOMPLETION = 1L;
-
- long EXT_STATE_DEFUNCT = 2L;
-
- long EXT_STATE_SELECTABLE_TEXT = 4L;
-
- long EXT_STATE_EDITABLE = 8L;
-
- long EXT_STATE_ACTIVE = 16L;
-
- long EXT_STATE_MODAL = 32L;
-
- long EXT_STATE_MULTI_LINE = 64L;
-
- long EXT_STATE_HORIZONTAL = 128L;
-
- long EXT_STATE_OPAQUE = 256L;
-
- long EXT_STATE_SINGLE_LINE = 512L;
-
- long EXT_STATE_TRANSIENT = 1024L;
-
- long EXT_STATE_VERTICAL = 2048L;
-
- long EXT_STATE_STALE = 4096L;
-
- long EXT_STATE_ENABLED = 8192L;
-
- long EXT_STATE_SENSITIVE = 16384L;
-
- long EXT_STATE_EXPANDABLE = 32768L;
-
-}
\ No newline at end of file
Deleted: workspace/mareshkau/xulrunner-1.9.2/org.mozilla.xpcom/src/org/mozilla/interfaces/nsIAccessibleTable.java
===================================================================
--- workspace/mareshkau/xulrunner-1.9.2/org.mozilla.xpcom/src/org/mozilla/interfaces/nsIAccessibleTable.java 2010-06-16 09:39:59 UTC (rev 22829)
+++ workspace/mareshkau/xulrunner-1.9.2/org.mozilla.xpcom/src/org/mozilla/interfaces/nsIAccessibleTable.java 2010-06-16 11:09:58 UTC (rev 22830)
@@ -1,206 +0,0 @@
-/*
- * DO NOT EDIT. THIS FILE IS GENERATED FROM
- * /builds/slave/mozilla-1.9.2-linux-xulrunner/build/accessible/public/nsIAccessibleTable.idl
- */
-
-package org.mozilla.interfaces;
-
-public interface nsIAccessibleTable extends nsISupports {
-
- String NS_IACCESSIBLETABLE_IID =
- "{035c0c0e-41e3-4985-8ad9-d9f14cdc667a}";
-
- /**
- * Return the caption accessible for the table. For example, html:caption
- * element of html:table element.
- */
- nsIAccessible getCaption();
-
- /**
- * Return summary description for the table. For example, @summary attribute
- * on html:table element.
- */
- String getSummary();
-
- /**
- * Return columns count in the table.
- */
- int getColumnCount();
-
- /**
- * Return rows count in the table.
- */
- int getRowCount();
-
- /**
- * Return the accessible object at the specified row and column in the table.
- * If both row and column index are valid then the corresponding accessible
- * object is returned that represents the requested cell regardless of whether
- * the cell is currently visible (on the screen).
- *
- * @param rowIndex [in] the row index to retrieve the cell at
- * @param columnIndex [in] the column index to retrieve the cell at
- */
- nsIAccessible getCellAt(int rowIndex, int columnIndex);
-
- /**
- * Translate the given row and column indices into the corresponding cell
- * index.
- *
- * @param rowIndex [in] the row index to return cell index at
- * @param columnIndex [in] the column index to return cell index at
- */
- int getCellIndexAt(int rowIndex, int columnIndex);
-
- /**
- * Translate the given cell index into the corresponding column index.
- *
- * @param cellIndex [in] index of the table cell to return column index for
- */
- int getColumnIndexAt(int cellIndex);
-
- /**
- * Translate the given cell index into the corresponding row index.
- *
- * @param cellIndex [in] index of the table cell to return row index for
- */
- int getRowIndexAt(int cellIndex);
-
- /**
- * Return the number of columns occupied by the accessible cell at
- * the specified row and column in the table. The result differs from 1 if
- * the specified cell spans multiple columns.
- *
- * @param row [in] row index of the cell to return the column extent for
- * @param column [in] column index of the cell to return the column extent
- * for
- */
- int getColumnExtentAt(int row, int column);
-
- /**
- * Return the number of rows occupied by the accessible cell at the specified
- * row and column in the table. The result differs from 1 if the specified
- * cell spans multiple rows.
- *
- * @param row [in] row index of the cell to return the column extent for
- * @param column [in] column index of the cell to return the column extent
- * for
- */
- int getRowExtentAt(int row, int column);
-
- /**
- * Return the description text of the specified column in the table.
- *
- * @param columnIndex [in] the column index to retrieve description for
- */
- String getColumnDescription(int columnIndex);
-
- /**
- * Return the description text of the specified row in the table.
- *
- * @param rowIndex [in] the row index to retrieve description for
- */
- String getRowDescription(int rowIndex);
-
- /**
- * Return a boolean value indicating whether the specified column is
- * selected, i.e. all cells within the column are selected.
- *
- * @param columnIndex [in] the column index to determine if it's selected
- */
- boolean isColumnSelected(int columnIndex);
-
- /**
- * Return a boolean value indicating whether the specified row is selected,
- * i.e. all cells within the row are selected.
- *
- * @param rowIndex [in] the row index to determine whether it's selected
- */
- boolean isRowSelected(int rowIndex);
-
- /**
- * Return a boolean value indicating whether the specified cell is selected.
- *
- * @param rowIndex [in] the row index of the cell
- * @param columnIndex [in] the column index of the cell
- */
- boolean isCellSelected(int rowIndex, int columnIndex);
-
- /**
- * Return the total number of selected cells.
- */
- long getSelectedCellCount();
-
- /**
- * Return the total number of selected columns.
- */
- long getSelectedColumnCount();
-
- /**
- * Return the total number of selected rows.
- */
- long getSelectedRowCount();
-
- /**
- * Return an array of selected cells.
- */
- nsIArray getSelectedCells();
-
- /**
- * Return an array of cell indices currently selected.
- *
- * @param cellsArraySize [in] length of array
- * @param cellsArray [in] array of indexes of selected cells
- */
- int[] getSelectedCellIndices(long[] cellsArraySize);
-
- /**
- * Return an array of column indices currently selected.
- *
- * @param columnsArraySize [in] length of array
- * @param columnsArray [in] array of indices of selected columns
- */
- int[] getSelectedColumnIndices(long[] columnsArraySize);
-
- /**
- * Return an array of row indices currently selected.
- *
- * @param rowsArraySize [in] Length of array
- * @param rowsArray [in] array of indices of selected rows
- */
- int[] getSelectedRowIndices(long[] rowsArraySize);
-
- /**
- * Select a row and unselects all previously selected rows.
- *
- * @param rowIndex [in] the row index to select
- */
- void selectRow(int rowIndex);
-
- /**
- * Select a column and unselects all previously selected columns.
- *
- * @param columnIndex [in] the column index to select
- */
- void selectColumn(int columnIndex);
-
- /**
- * Unselect the given row, leaving other selected rows selected (if any).
- *
- * @param rowIndex [in] the row index to select
- */
- void unselectRow(int rowIndex);
-
- /**
- * Unselect the given column, leaving other selected columns selected (if any).
- *
- * @param columnIndex [in] the column index to select
- */
- void unselectColumn(int columnIndex);
-
- /**
- * Use heuristics to determine if table is most likely used for layout.
- */
- boolean isProbablyForLayout();
-
-}
\ No newline at end of file
Deleted: workspace/mareshkau/xulrunner-1.9.2/org.mozilla.xpcom/src/org/mozilla/interfaces/nsIAccessibleTableCell.java
===================================================================
--- workspace/mareshkau/xulrunner-1.9.2/org.mozilla.xpcom/src/org/mozilla/interfaces/nsIAccessibleTableCell.java 2010-06-16 09:39:59 UTC (rev 22829)
+++ workspace/mareshkau/xulrunner-1.9.2/org.mozilla.xpcom/src/org/mozilla/interfaces/nsIAccessibleTableCell.java 2010-06-16 11:09:58 UTC (rev 22830)
@@ -1,55 +0,0 @@
-/*
- * DO NOT EDIT. THIS FILE IS GENERATED FROM
- * /builds/slave/mozilla-1.9.2-linux-xulrunner/build/accessible/public/nsIAccessibleTable.idl
- */
-
-package org.mozilla.interfaces;
-
-public interface nsIAccessibleTableCell extends nsISupports {
-
- String NS_IACCESSIBLETABLECELL_IID =
- "{654e296d-fae6-452b-987d-746b20b9514b}";
-
- /**
- * Return host table accessible.
- */
- nsIAccessibleTable getTable();
-
- /**
- * Return column index of this cell.
- */
- int getColumnIndex();
-
- /**
- * Return row index of this cell.
- */
- int getRowIndex();
-
- /**
- * Return the number of columns occupied by this cell. The result differs
- * from 1 if the specified cell spans multiple columns.
- */
- int getColumnExtent();
-
- /**
- * Return the number of rows occupied by this accessible cell. The result
- * differs from 1 if the specified cell spans multiple rows.
- */
- int getRowExtent();
-
- /**
- * Return an array of column header cells for this cell.
- */
- nsIArray getColumnHeaderCells();
-
- /**
- * Return an array of row header cells for this cell.
- */
- nsIArray getRowHeaderCells();
-
- /**
- * Return a boolean value indicating whether this cell is selected.
- */
- boolean isSelected();
-
-}
\ No newline at end of file
Deleted: workspace/mareshkau/xulrunner-1.9.2/org.mozilla.xpcom/src/org/mozilla/interfaces/nsIAccessibleTableChangeEvent.java
===================================================================
--- workspace/mareshkau/xulrunner-1.9.2/org.mozilla.xpcom/src/org/mozilla/interfaces/nsIAccessibleTableChangeEvent.java 2010-06-16 09:39:59 UTC (rev 22829)
+++ workspace/mareshkau/xulrunner-1.9.2/org.mozilla.xpcom/src/org/mozilla/interfaces/nsIAccessibleTableChangeEvent.java 2010-06-16 11:09:58 UTC (rev 22830)
@@ -1,23 +0,0 @@
-/*
- * DO NOT EDIT. THIS FILE IS GENERATED FROM
- * /builds/slave/mozilla-1.9.2-linux-xulrunner/build/accessible/public/nsIAccessibleEvent.idl
- */
-
-package org.mozilla.interfaces;
-
-public interface nsIAccessibleTableChangeEvent extends nsIAccessibleEvent {
-
- String NS_IACCESSIBLETABLECHANGEEVENT_IID =
- "{a9485c7b-5861-4695-8441-fab0235b205d}";
-
- /**
- * Return the row or column index.
- */
- int getRowOrColIndex();
-
- /**
- * Return the number of rows or cols
- */
- int getNumRowsOrCols();
-
-}
\ No newline at end of file
Deleted: workspace/mareshkau/xulrunner-1.9.2/org.mozilla.xpcom/src/org/mozilla/interfaces/nsIAccessibleText.java
===================================================================
--- workspace/mareshkau/xulrunner-1.9.2/org.mozilla.xpcom/src/org/mozilla/interfaces/nsIAccessibleText.java 2010-06-16 09:39:59 UTC (rev 22829)
+++ workspace/mareshkau/xulrunner-1.9.2/org.mozilla.xpcom/src/org/mozilla/interfaces/nsIAccessibleText.java 2010-06-16 11:09:58 UTC (rev 22830)
@@ -1,167 +0,0 @@
-/*
- * DO NOT EDIT. THIS FILE IS GENERATED FROM
- * /builds/slave/mozilla-1.9.2-linux-xulrunner/build/accessible/public/nsIAccessibleText.idl
- */
-
-package org.mozilla.interfaces;
-
-public interface nsIAccessibleText extends nsISupports {
-
- String NS_IACCESSIBLETEXT_IID =
- "{0f4633b1-550c-4b50-8c04-0eb1005eef2f}";
-
- int TEXT_OFFSET_END_OF_TEXT = -1;
-
- int TEXT_OFFSET_CARET = -2;
-
- int BOUNDARY_CHAR = 0;
-
- int BOUNDARY_WORD_START = 1;
-
- int BOUNDARY_WORD_END = 2;
-
- int BOUNDARY_SENTENCE_START = 3;
-
- int BOUNDARY_SENTENCE_END = 4;
-
- int BOUNDARY_LINE_START = 5;
-
- int BOUNDARY_LINE_END = 6;
-
- int BOUNDARY_ATTRIBUTE_RANGE = 7;
-
- /**
- * The current current caret offset.
- * If set < 0 then caret will be placed at the end of the text
- */
- int getCaretOffset();
-
- /**
- * The current current caret offset.
- * If set < 0 then caret will be placed at the end of the text
- */
- void setCaretOffset(int aCaretOffset);
-
- int getCharacterCount();
-
- int getSelectionCount();
-
- /**
- * String methods may need to return multibyte-encoded strings,
- * since some locales can't be encoded using 16-bit chars.
- * So the methods below might return UTF-16 strings, or they could
- * return "string" values which are UTF-8.
- */
- String getText(int startOffset, int endOffset);
-
- String getTextAfterOffset(int offset, int boundaryType, int[] startOffset, int[] endOffset);
-
- String getTextAtOffset(int offset, int boundaryType, int[] startOffset, int[] endOffset);
-
- String getTextBeforeOffset(int offset, int boundaryType, int[] startOffset, int[] endOffset);
-
- /**
- * It would be better to return an unsigned long here,
- * to allow unicode chars > 16 bits
- */
- char getCharacterAtOffset(int offset);
-
- /**
- * Get the accessible start/end offsets around the given offset,
- * return the text attributes for this range of text.
- *
- * @param includeDefAttrs [in] points whether text attributes applied to
- * the entire accessible should be included or not.
- * @param offset [in] text offset
- * @param rangeStartOffset [out] start offset of the range of text
- * @param rangeEndOffset [out] end offset of the range of text
- */
- nsIPersistentProperties getTextAttributes(boolean includeDefAttrs, int offset, int[] rangeStartOffset, int[] rangeEndOffset);
-
- /**
- * Return the text attributes that apply to the entire accessible.
- */
- nsIPersistentProperties getDefaultTextAttributes();
-
- /**
- * Returns the bounding box of the specified position.
- *
- * The virtual character after the last character of the represented text,
- * i.e. the one at position length is a special case. It represents the
- * current input position and will therefore typically be queried by AT more
- * often than other positions. Because it does not represent an existing
- * character its bounding box is defined in relation to preceding characters.
- * It should be roughly equivalent to the bounding box of some character when
- * inserted at the end of the text. Its height typically being the maximal
- * height of all the characters in the text or the height of the preceding
- * character, its width being at least one pixel so that the bounding box is
- * not degenerate.
- *
- * @param offset - Index of the character for which to return its bounding
- * box. The valid range is 0..length.
- * @param x - X coordinate of the bounding box of the referenced character.
- * @param y - Y coordinate of the bounding box of the referenced character.
- * @param width - Width of the bounding box of the referenced character.
- * @param height - Height of the bounding box of the referenced character.
- * @param coordType - Specifies if the coordinates are relative to the screen
- * or to the parent window (see constants declared in
- * nsIAccessibleCoordinateType).
- */
- void getCharacterExtents(int offset, int[] x, int[] y, int[] width, int[] height, long coordType);
-
- void getRangeExtents(int startOffset, int endOffset, int[] x, int[] y, int[] width, int[] height, long coordType);
-
- /**
- * Get the text offset at the given point, or return -1
- * if no character exists at that point
- *
- * @param x - The position's x value for which to look up the index of the
- * character that is rendered on to the display at that point.
- * @param y - The position's y value for which to look up the index of the
- * character that is rendered on to the display at that point.
- * @param coordType - Screen coordinates or window coordinates (see constants
- * declared in nsIAccessibleCoordinateType).
- * @return offset - Index of the character under the given point or -1 if
- * the point is invalid or there is no character under
- * the point.
- */
- int getOffsetAtPoint(int x, int y, long coordType);
-
- void getSelectionBounds(int selectionNum, int[] startOffset, int[] endOffset);
-
- /**
- * Set the bounds for the given selection range
- */
- void setSelectionBounds(int selectionNum, int startOffset, int endOffset);
-
- void addSelection(int startOffset, int endOffset);
-
- void removeSelection(int selectionNum);
-
- /**
- * Makes a specific part of string visible on screen.
- *
- * @param startIndex 0-based character offset
- * @param endIndex 0-based character offset - the offset of the
- * character just past the last character of the
- * string
- * @param scrollType defines how to scroll (see nsIAccessibleScrollType for
- * available constants)
- */
- void scrollSubstringTo(int startIndex, int endIndex, long scrollType);
-
- /**
- * Moves the top left of a substring to a specified location.
- *
- * @param startIndex 0-based character offset
- * @param endIndex 0-based character offset - the offset of the
- * character just past the last character of
- * the string
- * @param coordinateType specifies the coordinates origin (for available
- * constants refer to nsIAccessibleCoordinateType)
- * @param x defines the x coordinate
- * @param y defines the y coordinate
- */
- void scrollSubstringToPoint(int startIndex, int endIndex, long coordinateType, int x, int y);
-
-}
\ No newline at end of file
Deleted: workspace/mareshkau/xulrunner-1.9.2/org.mozilla.xpcom/src/org/mozilla/interfaces/nsIAccessibleTextChangeEvent.java
===================================================================
--- workspace/mareshkau/xulrunner-1.9.2/org.mozilla.xpcom/src/org/mozilla/interfaces/nsIAccessibleTextChangeEvent.java 2010-06-16 09:39:59 UTC (rev 22829)
+++ workspace/mareshkau/xulrunner-1.9.2/org.mozilla.xpcom/src/org/mozilla/interfaces/nsIAccessibleTextChangeEvent.java 2010-06-16 11:09:58 UTC (rev 22830)
@@ -1,33 +0,0 @@
-/*
- * DO NOT EDIT. THIS FILE IS GENERATED FROM
- * /builds/slave/mozilla-1.9.2-linux-xulrunner/build/accessible/public/nsIAccessibleEvent.idl
- */
-
-package org.mozilla.interfaces;
-
-public interface nsIAccessibleTextChangeEvent extends nsIAccessibleEvent {
-
- String NS_IACCESSIBLETEXTCHANGEEVENT_IID =
- "{50a1e151-8e5f-4bcc-aaaf-a4bed1190e93}";
-
- /**
- * Returns offset of changed text in accessible.
- */
- int getStart();
-
- /**
- * Returns length of changed text.
- */
- long getLength();
-
- /**
- * Returns true if text was inserted, otherwise false.
- */
- boolean isInserted();
-
- /**
- * The inserted or removed text
- */
- String getModifiedText();
-
-}
\ No newline at end of file
Deleted: workspace/mareshkau/xulrunner-1.9.2/org.mozilla.xpcom/src/org/mozilla/interfaces/nsIAccessibleValue.java
===================================================================
--- workspace/mareshkau/xulrunner-1.9.2/org.mozilla.xpcom/src/org/mozilla/interfaces/nsIAccessibleValue.java 2010-06-16 09:39:59 UTC (rev 22829)
+++ workspace/mareshkau/xulrunner-1.9.2/org.mozilla.xpcom/src/org/mozilla/interfaces/nsIAccessibleValue.java 2010-06-16 11:09:58 UTC (rev 22830)
@@ -1,23 +0,0 @@
-/*
- * DO NOT EDIT. THIS FILE IS GENERATED FROM
- * /builds/slave/mozilla-1.9.2-linux-xulrunner/build/accessible/public/nsIAccessibleValue.idl
- */
-
-package org.mozilla.interfaces;
-
-public interface nsIAccessibleValue extends nsISupports {
-
- String NS_IACCESSIBLEVALUE_IID =
- "{42a1e1dc-58cf-419d-bff0-ed3314c70016}";
-
- double getMaximumValue();
-
- double getMinimumValue();
-
- double getCurrentValue();
-
- void setCurrentValue(double aCurrentValue);
-
- double getMinimumIncrement();
-
-}
\ No newline at end of file
Deleted: workspace/mareshkau/xulrunner-1.9.2/org.mozilla.xpcom/src/org/mozilla/interfaces/nsIAccessibleWin32Object.java
===================================================================
--- workspace/mareshkau/xulrunner-1.9.2/org.mozilla.xpcom/src/org/mozilla/interfaces/nsIAccessibleWin32Object.java 2010-06-16 09:39:59 UTC (rev 22829)
+++ workspace/mareshkau/xulrunner-1.9.2/org.mozilla.xpcom/src/org/mozilla/interfaces/nsIAccessibleWin32Object.java 2010-06-16 11:09:58 UTC (rev 22830)
@@ -1,13 +0,0 @@
-/*
- * DO NOT EDIT. THIS FILE IS GENERATED FROM
- * e:/builds/moz2_slave/mozilla-1.9.2-win32-xulrunner/build/accessible/public/msaa/nsIAccessibleWin32Object.idl
- */
-
-package org.mozilla.interfaces;
-
-public interface nsIAccessibleWin32Object extends nsISupports {
-
- String NS_IACCESSIBLEWIN32OBJECT_IID =
- "{ca7a3a93-822f-4cdf-8cb4-c52d16b9afc7}";
-
-}
\ No newline at end of file
Deleted: workspace/mareshkau/xulrunner-1.9.2/org.mozilla.xpcom/src/org/mozilla/interfaces/nsIActiveXSecurityPolicy.java
===================================================================
--- workspace/mareshkau/xulrunner-1.9.2/org.mozilla.xpcom/src/org/mozilla/interfaces/nsIActiveXSecurityPolicy.java 2010-06-16 09:39:59 UTC (rev 22829)
+++ workspace/mareshkau/xulrunner-1.9.2/org.mozilla.xpcom/src/org/mozilla/interfaces/nsIActiveXSecurityPolicy.java 2010-06-16 11:09:58 UTC (rev 22830)
@@ -1,38 +0,0 @@
-/*
- * DO NOT EDIT. THIS FILE IS GENERATED FROM
- * e:/builds/moz2_slave/mozilla-1.9.2-win32-xulrunner/build/js/src/xpconnect/idl/nsIActiveXSecurityPolicy.idl
- */
-
-package org.mozilla.interfaces;
-
-public interface nsIActiveXSecurityPolicy extends nsISupports {
-
- String NS_IACTIVEXSECURITYPOLICY_IID =
- "{0a3928d2-76c8-4c25-86a9-9c005ad832f4}";
-
- /** Host nothing at all. */
- long HOSTING_FLAGS_HOST_NOTHING = 0L;
-
- /** Allow hosting of safe for scripting objects. */
- long HOSTING_FLAGS_HOST_SAFE_OBJECTS = 1L;
-
- /** Allow any object to be hosted. */
- long HOSTING_FLAGS_HOST_ALL_OBJECTS = 2L;
-
- /** Allow objects to be downloaded and installed. */
- long HOSTING_FLAGS_DOWNLOAD_CONTROLS = 4L;
-
- /** Allow objects marked safe for scripting to be scripted. */
- long HOSTING_FLAGS_SCRIPT_SAFE_OBJECTS = 8L;
-
- /** Allow any object to be scripted. */
- long HOSTING_FLAGS_SCRIPT_ALL_OBJECTS = 16L;
-
- /**
- * Return the ActiveX security and hosting flags.
- * @param context The context for which flags are requested. At present the
- * only valid value is nsnull.
- */
- long getHostingFlags(String aContext);
-
-}
\ No newline at end of file
Deleted: workspace/mareshkau/xulrunner-1.9.2/org.mozilla.xpcom/src/org/mozilla/interfaces/nsIPrintSettingsWin.java
===================================================================
--- workspace/mareshkau/xulrunner-1.9.2/org.mozilla.xpcom/src/org/mozilla/interfaces/nsIPrintSettingsWin.java 2010-06-16 09:39:59 UTC (rev 22829)
+++ workspace/mareshkau/xulrunner-1.9.2/org.mozilla.xpcom/src/org/mozilla/interfaces/nsIPrintSettingsWin.java 2010-06-16 11:09:58 UTC (rev 22830)
@@ -1,18 +0,0 @@
-/*
- * DO NOT EDIT. THIS FILE IS GENERATED FROM
- * e:/builds/moz2_slave/mozilla-1.9.2-win32-xulrunner/build/widget/public/nsIPrintSettingsWin.idl
- */
-
-package org.mozilla.interfaces;
-
-/**
- * Simplified PrintSettings for Windows interface
- *
- * @status UNDER_REVIEW
- */
-public interface nsIPrintSettingsWin extends nsISupports {
-
- String NS_IPRINTSETTINGSWIN_IID =
- "{f13b225d-473e-4372-b11f-b6dff9fe0c5b}";
-
-}
\ No newline at end of file
Deleted: workspace/mareshkau/xulrunner-1.9.2/org.mozilla.xpcom/src/org/mozilla/interfaces/nsITaskbarPreview.java
===================================================================
--- workspace/mareshkau/xulrunner-1.9.2/org.mozilla.xpcom/src/org/mozilla/interfaces/nsITaskbarPreview.java 2010-06-16 09:39:59 UTC (rev 22829)
+++ workspace/mareshkau/xulrunner-1.9.2/org.mozilla.xpcom/src/org/mozilla/interfaces/nsITaskbarPreview.java 2010-06-16 11:09:58 UTC (rev 22830)
@@ -1,110 +0,0 @@
-/*
- * DO NOT EDIT. THIS FILE IS GENERATED FROM
- * e:/builds/moz2_slave/mozilla-1.9.2-win32-xulrunner/build/widget/public/nsITaskbarPreview.idl
- */
-
-package org.mozilla.interfaces;
-
-/**
- * nsITaskbarPreview
- *
- * Common interface for both window and tab taskbar previews. This interface
- * cannot be instantiated directly.
- *
- */
-public interface nsITaskbarPreview extends nsISupports {
-
- String NS_ITASKBARPREVIEW_IID =
- "{cbfdf766-d002-403b-a3d9-b091c9ad465b}";
-
- /**
- * The controller for this preview. A controller is required to provide
- * the behavior and appearance of the taskbar previews. It is responsible for
- * determining the size and contents of the preview, which buttons are
- * displayed and how the application responds to user actions on the preview.
- *
- * Neither preview makes full use of the controller. See the documentation
- * for nsITaskbarWindowPreview and nsITaskbarTabPreview for details on which
- * controller methods are used.
- *
- * The controller is not allowed to be null.
- *
- * @see nsITaskbarPreviewController
- */
- nsITaskbarPreviewController getController();
-
- /**
- * The controller for this preview. A controller is required to provide
- * the behavior and appearance of the taskbar previews. It is responsible for
- * determining the size and contents of the preview, which buttons are
- * displayed and how the application responds to user actions on the preview.
- *
- * Neither preview makes full use of the controller. See the documentation
- * for nsITaskbarWindowPreview and nsITaskbarTabPreview for details on which
- * controller methods are used.
- *
- * The controller is not allowed to be null.
- *
- * @see nsITaskbarPreviewController
- */
- void setController(nsITaskbarPreviewController aController);
-
- /**
- * The tooltip displayed above the preview when the user hovers over it
- *
- * Default: an empty string
- */
- String getTooltip();
-
- /**
- * The tooltip displayed above the preview when the user hovers over it
- *
- * Default: an empty string
- */
- void setTooltip(String aTooltip);
-
- /**
- * Whether or not the preview is visible.
- *
- * Changing this option is expensive for tab previews since toggling this
- * option will destroy/create the proxy window and its registration with the
- * taskbar. If any step of that fails, an exception will be thrown.
- *
- * For window previews, this operation is very cheap.
- *
- * Default: false
- */
- boolean getVisible();
-
- /**
- * Whether or not the preview is visible.
- *
- * Changing this option is expensive for tab previews since toggling this
- * option will destroy/create the proxy window and its registration with the
- * taskbar. If any step of that fails, an exception will be thrown.
- *
- * For window previews, this operation is very cheap.
- *
- * Default: false
- */
- void setVisible(boolean aVisible);
-
- /**
- * Gets/sets whether or not the preview is marked active (selected) in the
- * taskbar.
- */
- boolean getActive();
-
- /**
- * Gets/sets whether or not the preview is marked active (selected) in the
- * taskbar.
- */
- void setActive(boolean aActive);
-
- /**
- * Invalidates the taskbar's cached image of this preview, forcing a redraw
- * if necessary
- */
- void invalidate();
-
-}
\ No newline at end of file
Deleted: workspace/mareshkau/xulrunner-1.9.2/org.mozilla.xpcom/src/org/mozilla/interfaces/nsITaskbarPreviewButton.java
===================================================================
--- workspace/mareshkau/xulrunner-1.9.2/org.mozilla.xpcom/src/org/mozilla/interfaces/nsITaskbarPreviewButton.java 2010-06-16 09:39:59 UTC (rev 22829)
+++ workspace/mareshkau/xulrunner-1.9.2/org.mozilla.xpcom/src/org/mozilla/interfaces/nsITaskbarPreviewButton.java 2010-06-16 11:09:58 UTC (rev 22830)
@@ -1,104 +0,0 @@
-/*
- * DO NOT EDIT. THIS FILE IS GENERATED FROM
- * e:/builds/moz2_slave/mozilla-1.9.2-win32-xulrunner/build/widget/public/nsITaskbarPreviewButton.idl
- */
-
-package org.mozilla.interfaces;
-
-/**
- * nsITaskbarPreviewButton
- *
- * Provides access to a window preview's toolbar button's properties.
- */
-public interface nsITaskbarPreviewButton extends nsISupports {
-
- String NS_ITASKBARPREVIEWBUTTON_IID =
- "{ced8842d-fe37-4767-9a8e-fdfa56510c75}";
-
- /**
- * The button's tooltip.
- *
- * Default: an empty string
- */
- String getTooltip();
-
- /**
- * The button's tooltip.
- *
- * Default: an empty string
- */
- void setTooltip(String aTooltip);
-
- /**
- * True if the array of previews should be dismissed when this button is clicked.
- *
- * Default: false
- */
- boolean getDismissOnClick();
-
- /**
- * True if the array of previews should be dismissed when this button is clicked.
- *
- * Default: false
- */
- void setDismissOnClick(boolean aDismissOnClick);
-
- /**
- * True if the taskbar should draw a border around this button's image.
- *
- * Default: true
- */
- boolean getHasBorder();
-
- /**
- * True if the taskbar should draw a border around this button's image.
- *
- * Default: true
- */
- void setHasBorder(boolean aHasBorder);
-
- /**
- * True if the button is disabled. This is not the same as visible.
- *
- * Default: false
- */
- boolean getDisabled();
-
- /**
- * True if the button is disabled. This is not the same as visible.
- *
- * Default: false
- */
- void setDisabled(boolean aDisabled);
-
- /**
- * The icon used for the button.
- *
- * Default: null
- */
- imgIContainer getImage();
-
- /**
- * The icon used for the button.
- *
- * Default: null
- */
- void setImage(imgIContainer aImage);
-
- /**
- * True if the button is shown. Buttons that are invisible do not
- * participate in the layout of buttons underneath the preview.
- *
- * Default: false
- */
- boolean getVisible();
-
- /**
- * True if the button is shown. Buttons that are invisible do not
- * participate in the layout of buttons underneath the preview.
- *
- * Default: false
- */
- void setVisible(boolean aVisible);
-
-}
\ No newline at end of file
Deleted: workspace/mareshkau/xulrunner-1.9.2/org.mozilla.xpcom/src/org/mozilla/interfaces/nsITaskbarPreviewController.java
===================================================================
--- workspace/mareshkau/xulrunner-1.9.2/org.mozilla.xpcom/src/org/mozilla/interfaces/nsITaskbarPreviewController.java 2010-06-16 09:39:59 UTC (rev 22829)
+++ workspace/mareshkau/xulrunner-1.9.2/org.mozilla.xpcom/src/org/mozilla/interfaces/nsITaskbarPreviewController.java 2010-06-16 11:09:58 UTC (rev 22830)
@@ -1,88 +0,0 @@
-/*
- * DO NOT EDIT. THIS FILE IS GENERATED FROM
- * e:/builds/moz2_slave/mozilla-1.9.2-win32-xulrunner/build/widget/public/nsITaskbarPreviewController.idl
- */
-
-package org.mozilla.interfaces;
-
-/**
- * nsITaskbarPreviewController
- *
- * nsITaskbarPreviewController provides the behavior for the taskbar previews.
- * Its methods and properties are used by nsITaskbarPreview. Clients are
- * intended to provide their own implementation of this interface. Depending on
- * the interface the controller is attached to, only certain methods/attributes
- * are required to be implemented.
- */
-public interface nsITaskbarPreviewController extends nsISupports {
-
- String NS_ITASKBARPREVIEWCONTROLLER_IID =
- "{4fc0afbb-3e22-4fba-ac21-953350af0411}";
-
- /**
- * The width of the preview image. This value is allowed to change at any
- * time. See drawPreview for more information.
- */
- long getWidth();
-
- /**
- * The height of the preview image. This value is allowed to change at any
- * time. See drawPreview for more information.
- */
- long getHeight();
-
- /**
- * The aspect ratio of the thumbnail - this does not need to match the ratio
- * of the preview. This value is allowed to change at any time. See
- * drawThumbnail for more information.
- */
- float getThumbnailAspectRatio();
-
- /**
- * Invoked by nsITaskbarPreview when it needs to render the preview. The
- * context is attached to a surface with the controller's width and height
- * which are obtained immediately before the call.
- *
- * Note that the context is not attached to a canvas element.
- *
- * @param ctx Canvas drawing context
- */
- boolean drawPreview(nsIDOMCanvasRenderingContext2D ctx);
-
- /**
- * Invoked by the taskbar preview when it needs to draw the thumbnail in the
- * taskbar's application preview window.
- *
- * Note: it is guaranteed that width/height == thumbnailAspectRatio
- * (modulo rounding errors)
- *
- * Also note that the context is not attached to a canvas element.
- *
- * @param ctx Canvas drawing context
- * @param width The width of the surface backing the drawing context
- * @param height The height of the surface backing the drawing context
- */
- boolean drawThumbnail(nsIDOMCanvasRenderingContext2D ctx, long width, long height);
-
- /**
- * Invoked when the user presses the close button on the tab preview.
- */
- void onClose();
-
- /**
- * Invoked when the user clicks on the tab preview.
- *
- * @return true if the top level window corresponding to the preview should
- * be activated, false if activation is not accepted.
- */
- boolean onActivate();
-
- /**
- * Invoked when one of the buttons on the window preview's toolbar is pressed.
- *
- * @param button The button that was pressed. This can be compared with the
- * buttons returned by nsITaskbarWindowPreview.getButton.
- */
- void onClick(nsITaskbarPreviewButton button);
-
-}
\ No newline at end of file
Deleted: workspace/mareshkau/xulrunner-1.9.2/org.mozilla.xpcom/src/org/mozilla/interfaces/nsITaskbarProgress.java
===================================================================
--- workspace/mareshkau/xulrunner-1.9.2/org.mozilla.xpcom/src/org/mozilla/interfaces/nsITaskbarProgress.java 2010-06-16 09:39:59 UTC (rev 22829)
+++ workspace/mareshkau/xulrunner-1.9.2/org.mozilla.xpcom/src/org/mozilla/interfaces/nsITaskbarProgress.java 2010-06-16 11:09:58 UTC (rev 22830)
@@ -1,55 +0,0 @@
-/*
- * DO NOT EDIT. THIS FILE IS GENERATED FROM
- * e:/builds/moz2_slave/mozilla-1.9.2-win32-xulrunner/build/widget/public/nsITaskbarProgress.idl
- */
-
-package org.mozilla.interfaces;
-
-/**
- * Starting in Windows 7, applications can display a progress notification in
- * the taskbar. This class wraps around the native functionality to do this.
- */
-public interface nsITaskbarProgress extends nsISupports {
-
- String NS_ITASKBARPROGRESS_IID =
- "{23ac257d-ef3c-4033-b424-be7fef91a86c}";
-
- /**
- * Stop displaying progress on the taskbar button. This should be used when
- * the operation is complete or cancelled.
- */
- int STATE_NO_PROGRESS = 0;
-
- /**
- * Display a cycling, indeterminate progress bar.
- */
- int STATE_INDETERMINATE = 1;
-
- /**
- * Display a determinate, normal progress bar.
- */
- int STATE_NORMAL = 2;
-
- /**
- * Display a determinate, error progress bar.
- */
- int STATE_ERROR = 3;
-
- /**
- * Display a determinate progress bar indicating that the operation has
- * paused.
- */
- int STATE_PAUSED = 4;
-
- /**
- * Sets the taskbar progress state and value for this window. The currentValue
- * and maxValue parameters are optional and should be supplied when |state|
- * is one of STATE_NORMAL, STATE_ERROR or STATE_PAUSED.
- *
- * @throws NS_ERROR_INVALID_ARG if state is STATE_NO_PROGRESS or
- * STATE_INDETERMINATE, and either currentValue or maxValue is not 0.
- * @throws NS_ERROR_ILLEGAL_VALUE if currentValue is greater than maxValue.
- */
- void setProgressState(int state, double currentValue, double maxValue);
-
-}
\ No newline at end of file
Deleted: workspace/mareshkau/xulrunner-1.9.2/org.mozilla.xpcom/src/org/mozilla/interfaces/nsITaskbarTabPreview.java
===================================================================
--- workspace/mareshkau/xulrunner-1.9.2/org.mozilla.xpcom/src/org/mozilla/interfaces/nsITaskbarTabPreview.java 2010-06-16 09:39:59 UTC (rev 22829)
+++ workspace/mareshkau/xulrunner-1.9.2/org.mozilla.xpcom/src/org/mozilla/interfaces/nsITaskbarTabPreview.java 2010-06-16 11:09:58 UTC (rev 22830)
@@ -1,48 +0,0 @@
-/*
- * DO NOT EDIT. THIS FILE IS GENERATED FROM
- * e:/builds/moz2_slave/mozilla-1.9.2-win32-xulrunner/build/widget/public/nsITaskbarTabPreview.idl
- */
-
-package org.mozilla.interfaces;
-
-public interface nsITaskbarTabPreview extends nsITaskbarPreview {
-
- String NS_ITASKBARTABPREVIEW_IID =
- "{11e4c8bd-5c2d-4e1a-a9a1-79dd5b0fe544}";
-
- /**
- * The title displayed above the thumbnail
- *
- * Default: an empty string
- */
- String getTitle();
-
- /**
- * The title displayed above the thumbnail
- *
- * Default: an empty string
- */
- void setTitle(String aTitle);
-
- /**
- * The icon displayed next to the title in the preview
- *
- * Default: null
- */
- imgIContainer getIcon();
-
- /**
- * The icon displayed next to the title in the preview
- *
- * Default: null
- */
- void setIcon(imgIContainer aIcon);
-
- /**
- * Rearranges the preview relative to another tab preview from the same window
- * @param aNext The preview to the right of this one. A value of null
- * indicates that the preview is the rightmost one.
- */
- void move(nsITaskbarTabPreview aNext);
-
-}
\ No newline at end of file
Deleted: workspace/mareshkau/xulrunner-1.9.2/org.mozilla.xpcom/src/org/mozilla/interfaces/nsITaskbarWindowPreview.java
===================================================================
--- workspace/mareshkau/xulrunner-1.9.2/org.mozilla.xpcom/src/org/mozilla/interfaces/nsITaskbarWindowPreview.java 2010-06-16 09:39:59 UTC (rev 22829)
+++ workspace/mareshkau/xulrunner-1.9.2/org.mozilla.xpcom/src/org/mozilla/interfaces/nsITaskbarWindowPreview.java 2010-06-16 11:09:58 UTC (rev 22830)
@@ -1,43 +0,0 @@
-/*
- * DO NOT EDIT. THIS FILE IS GENERATED FROM
- * e:/builds/moz2_slave/mozilla-1.9.2-win32-xulrunner/build/widget/public/nsITaskbarWindowPreview.idl
- */
-
-package org.mozilla.interfaces;
-
-public interface nsITaskbarWindowPreview extends nsITaskbarPreview {
-
- String NS_ITASKBARWINDOWPREVIEW_IID =
- "{ec67cc57-342d-4064-b4c6-74a375e07b10}";
-
- /**
- * Max 7 buttons per preview per the Windows Taskbar API
- */
- int NUM_TOOLBAR_BUTTONS = 7;
-
- /**
- * Gets the nth button for the preview image. By default, all of the buttons
- * are invisible.
- *
- * @see nsITaskbarPreviewButton
- *
- * @param index The index into the button array. Must be >= 0 and <
- * MAX_TOOLBAR_BUTTONS.
- */
- nsITaskbarPreviewButton getButton(long index);
-
- /**
- * Enables/disables custom drawing of thumbnails and previews
- *
- * Default value: false
- */
- boolean getEnableCustomDrawing();
-
- /**
- * Enables/disables custom drawing of thumbnails and previews
- *
- * Default value: false
- */
- void setEnableCustomDrawing(boolean aEnableCustomDrawing);
-
-}
\ No newline at end of file
Deleted: workspace/mareshkau/xulrunner-1.9.2/org.mozilla.xpcom/src/org/mozilla/interfaces/nsIWinAppHelper.java
===================================================================
--- workspace/mareshkau/xulrunner-1.9.2/org.mozilla.xpcom/src/org/mozilla/interfaces/nsIWinAppHelper.java 2010-06-16 09:39:59 UTC (rev 22829)
+++ workspace/mareshkau/xulrunner-1.9.2/org.mozilla.xpcom/src/org/mozilla/interfaces/nsIWinAppHelper.java 2010-06-16 11:09:58 UTC (rev 22830)
@@ -1,22 +0,0 @@
-/*
- * DO NOT EDIT. THIS FILE IS GENERATED FROM
- * e:/builds/moz2_slave/mozilla-1.9.2-win32-xulrunner/build/toolkit/xre/nsIWinAppHelper.idl
- */
-
-package org.mozilla.interfaces;
-
-/**
- * A scriptable interface used on Windows only to do some work from
- * a special process that gets created with elevated privileges.
- *
- * @status UNSTABLE - This interface is not frozen and will probably change in
- * future releases.
- */
-public interface nsIWinAppHelper extends nsISupports {
-
- String NS_IWINAPPHELPER_IID =
- "{dc263ca8-b257-47eb-b5b7-339d9e0b90f7}";
-
- boolean getUserCanElevate();
-
-}
\ No newline at end of file
Deleted: workspace/mareshkau/xulrunner-1.9.2/org.mozilla.xpcom/src/org/mozilla/interfaces/nsIWinTaskbar.java
===================================================================
--- workspace/mareshkau/xulrunner-1.9.2/org.mozilla.xpcom/src/org/mozilla/interfaces/nsIWinTaskbar.java 2010-06-16 09:39:59 UTC (rev 22829)
+++ workspace/mareshkau/xulrunner-1.9.2/org.mozilla.xpcom/src/org/mozilla/interfaces/nsIWinTaskbar.java 2010-06-16 11:09:58 UTC (rev 22830)
@@ -1,41 +0,0 @@
-/*
- * DO NOT EDIT. THIS FILE IS GENERATED FROM
- * e:/builds/moz2_slave/mozilla-1.9.2-win32-xulrunner/build/widget/public/nsIWinTaskbar.idl
- */
-
-package org.mozilla.interfaces;
-
-public interface nsIWinTaskbar extends nsISupports {
-
- String NS_IWINTASKBAR_IID =
- "{0a3abac7-35b7-4b50-8381-7dbc3c55b061}";
-
- /**
- * Returns true if the taskbar service is available. This value does not
- * change during runtime.
- */
- boolean getAvailable();
-
- /**
- * Creates a taskbar preview. The docshell is used to find the toplevel window.
- * See the documentation for nsITaskbarTabPreview for more information.
- */
- nsITaskbarTabPreview createTaskbarTabPreview(nsIDocShell shell, nsITaskbarPreviewController controller);
-
- /**
- * Gets the taskbar preview for a window. The docshell is used to find the
- * toplevel window. See the documentation for nsITaskbarTabPreview for more
- * information.
- *
- * Note: to implement custom drawing or buttons, a controller is required.
- */
- nsITaskbarWindowPreview getTaskbarWindowPreview(nsIDocShell shell);
-
- /**
- * Gets the taskbar progress for a window. The docshell is used to find the
- * toplevel window. See the documentation for nsITaskbarProgress for more
- * information.
- */
- nsITaskbarProgress getTaskbarProgress(nsIDocShell shell);
-
-}
\ No newline at end of file
Deleted: workspace/mareshkau/xulrunner-1.9.2/org.mozilla.xpcom/src/org/mozilla/interfaces/nsIWindowsRegKey.java
===================================================================
--- workspace/mareshkau/xulrunner-1.9.2/org.mozilla.xpcom/src/org/mozilla/interfaces/nsIWindowsRegKey.java 2010-06-16 09:39:59 UTC (rev 22829)
+++ workspace/mareshkau/xulrunner-1.9.2/org.mozilla.xpcom/src/org/mozilla/interfaces/nsIWindowsRegKey.java 2010-06-16 11:09:58 UTC (rev 22830)
@@ -1,324 +0,0 @@
-/*
- * DO NOT EDIT. THIS FILE IS GENERATED FROM
- * e:/builds/moz2_slave/mozilla-1.9.2-win32-xulrunner/build/xpcom/ds/nsIWindowsRegKey.idl
- */
-
-package org.mozilla.interfaces;
-
-/**
- * This interface is designed to provide scriptable access to the Windows
- * registry system ("With Great Power Comes Great Responsibility"). The
- * interface represents a single key in the registry.
- *
- * This interface is highly Win32 specific.
- */
-public interface nsIWindowsRegKey extends nsISupports {
-
- String NS_IWINDOWSREGKEY_IID =
- "{2555b930-d64f-437e-9be7-0a2cb252c1f4}";
-
- /**
- * Root keys. The values for these keys correspond to the values from
- * WinReg.h in the MS Platform SDK. The ROOT_KEY_ prefix corresponds to the
- * HKEY_ prefix in the MS Platform SDK.
- *
- * This interface is not restricted to using only these root keys.
- */
- long ROOT_KEY_CLASSES_ROOT = 2147483648L;
-
- long ROOT_KEY_CURRENT_USER = 2147483649L;
-
- long ROOT_KEY_LOCAL_MACHINE = 2147483650L;
-
- /**
- * Values for the mode parameter passed to the open and create methods.
- * The values defined here correspond to the REGSAM values defined in
- * WinNT.h in the MS Platform SDK, where ACCESS_ is replaced with KEY_.
- *
- * This interface is not restricted to using only these access types.
- */
- long ACCESS_BASIC = 131072L;
-
- long ACCESS_QUERY_VALUE = 1L;
-
- long ACCESS_SET_VALUE = 2L;
-
- long ACCESS_CREATE_SUB_KEY = 4L;
-
- long ACCESS_ENUMERATE_SUB_KEYS = 8L;
-
- long ACCESS_NOTIFY = 16L;
-
- long ACCESS_READ = 131097L;
-
- long ACCESS_WRITE = 131078L;
-
- long ACCESS_ALL = 131103L;
-
- /**
- * Values for the type of a registry value. The numeric values of these
- * constants are taken directly from WinNT.h in the MS Platform SDK.
- * The Microsoft documentation should be consulted for the exact meaning of
- * these value types.
- *
- * This interface is somewhat restricted to using only these value types.
- * There is no method that is directly equivalent to RegQueryValueEx or
- * RegSetValueEx. In particular, this interface does not support the
- * REG_MULTI_SZ and REG_EXPAND_SZ value types. It is still possible to
- * enumerate values that have other types (i.e., getValueType may return a
- * type not defined below).
- */
- long TYPE_NONE = 0L;
-
- long TYPE_STRING = 1L;
-
- long TYPE_BINARY = 3L;
-
- long TYPE_INT = 4L;
-
- long TYPE_INT64 = 11L;
-
- /**
- * This method closes the key. If the key is already closed, then this
- * method does nothing.
- */
- void close();
-
- /**
- * This method opens an existing key. This method fails if the key
- * does not exist.
- *
- * NOTE: On 32-bit Windows, it is valid to pass any HKEY as the rootKey
- * parameter of this function. However, for compatibility with 64-bit
- * Windows, that usage should probably be avoided in favor of openChild.
- *
- * @param rootKey
- * A root key defined above or any valid HKEY on 32-bit Windows.
- * @param relPath
- * A relative path from the given root key.
- * @param mode
- * Access mode, which is a bit-wise OR of the ACCESS_ values defined
- * above.
- */
- void open(long rootKey, String relPath, long mode);
-
- /**
- * This method opens an existing key or creates a new key.
- *
- * NOTE: On 32-bit Windows, it is valid to pass any HKEY as the rootKey
- * parameter of this function. However, for compatibility with 64-bit
- * Windows, that usage should probably be avoided in favor of createChild.
- *
- * @param rootKey
- * A root key defined above or any valid HKEY on 32-bit Windows.
- * @param relPath
- * A relative path from the given root key.
- * @param mode
- * Access mode, which is a bit-wise OR of the ACCESS_ values defined
- * above.
- */
- void create(long rootKey, String relPath, long mode);
-
- /**
- * This method opens a subkey relative to this key. This method fails if the
- * key does not exist.
- *
- * @return nsIWindowsRegKey for the newly opened subkey.
- */
- nsIWindowsRegKey openChild(String relPath, long mode);
-
- /**
- * This method opens or creates a subkey relative to this key.
- *
- * @return nsIWindowsRegKey for the newly opened or created subkey.
- */
- nsIWindowsRegKey createChild(String relPath, long mode);
-
- /**
- * This attribute returns the number of child keys.
- */
- long getChildCount();
-
- /**
- * This method returns the name of the n'th child key.
- *
- * @param index
- * The index of the requested child key.
- */
- String getChildName(long index);
-
- /**
- * This method checks to see if the key has a child by the given name.
- *
- * @param name
- * The name of the requested child key.
- */
- boolean hasChild(String name);
-
- /**
- * This attribute returns the number of values under this key.
- */
- long getValueCount();
-
- /**
- * This method returns the name of the n'th value under this key.
- *
- * @param index
- * The index of the requested value.
- */
- String getValueName(long index);
-
- /**
- * This method checks to see if the key has a value by the given name.
- *
- * @param name
- * The name of the requested value.
- */
- boolean hasValue(String name);
-
- /**
- * This method removes a child key and all of its values. This method will
- * fail if the key has any children of its own.
- *
- * @param relPath
- * The relative path from this key to the key to be removed.
- */
- void removeChild(String relPath);
-
- /**
- * This method removes the value with the given name.
- *
- * @param name
- * The name of the value to be removed.
- */
- void removeValue(String name);
-
- /**
- * This method returns the type of the value with the given name. The return
- * value is one of the "TYPE_" constants defined above.
- *
- * @param name
- * The name of the value to query.
- */
- long getValueType(String name);
-
- /**
- * This method reads the string contents of the named value as a Unicode
- * string.
- *
- * @param name
- * The name of the value to query. This parameter can be the empty
- * string to request the key's default value.
- */
- String readStringValue(String name);
-
- /**
- * This method reads the integer contents of the named value.
- *
- * @param name
- * The name of the value to query.
- */
- long readIntValue(String name);
-
- /**
- * This method reads the 64-bit integer contents of the named value.
- *
- * @param name
- * The name of the value to query.
- */
- double readInt64Value(String name);
-
- /**
- * This method reads the binary contents of the named value under this key.
- *
- * JavaScript callers should take care with the result of this method since
- * it will be byte-expanded to form a JS string. (The binary data will be
- * treated as an ISO-Latin-1 character string, which it is not).
- *
- * @param name
- * The name of the value to query.
- */
- String readBinaryValue(String name);
-
- /**
- * This method writes the unicode string contents of the named value. The
- * value will be created if it does not already exist.
- *
- * @param name
- * The name of the value to modify. This parameter can be the empty
- * string to modify the key's default value.
- * @param data
- * The data for the value to modify.
- */
- void writeStringValue(String name, String data);
-
- /**
- * This method writes the integer contents of the named value. The value
- * will be created if it does not already exist.
- *
- * @param name
- * The name of the value to modify.
- * @param data
- * The data for the value to modify.
- */
- void writeIntValue(String name, long data);
-
- /**
- * This method writes the 64-bit integer contents of the named value. The
- * value will be created if it does not already exist.
- *
- * @param name
- * The name of the value to modify.
- * @param data
- * The data for the value to modify.
- */
- void writeInt64Value(String name, double data);
-
- /**
- * This method writes the binary contents of the named value. The value will
- * be created if it does not already exist.
- *
- * JavaScript callers should take care with the value passed to this method
- * since it will be truncated from a JS string (unicode) to a ISO-Latin-1
- * string. (The binary data will be treated as an ISO-Latin-1 character
- * string, which it is not). So, JavaScript callers should only pass
- * character values in the range \u0000 to \u00FF, or else data loss will
- * occur.
- *
- * @param name
- * The name of the value to modify.
- * @param data
- * The data for the value to modify.
- */
- void writeBinaryValue(String name, String data);
-
- /**
- * This method starts watching the key to see if any of its values have
- * changed. The key must have been opened with mode including ACCESS_NOTIFY.
- * If recurse is true, then this key and any of its descendant keys are
- * watched. Otherwise, only this key is watched.
- *
- * @param recurse
- * Indicates whether or not to also watch child keys.
- */
- void startWatching(boolean recurse);
-
- /**
- * This method stops any watching of the key initiated by a call to
- * startWatching. This method does nothing if the key is not being watched.
- */
- void stopWatching();
-
- /**
- * This method returns true if the key is being watched for changes (i.e.,
- * if startWatching() was called).
- */
- boolean isWatching();
-
- /**
- * This method returns true if the key has changed and false otherwise.
- * This method will always return false if startWatching was not called.
- */
- boolean hasChanged();
-
-}
\ No newline at end of file
Deleted: workspace/mareshkau/xulrunner-1.9.2/org.mozilla.xpcom/src/org/mozilla/interfaces/nsIXBLAccessible.java
===================================================================
--- workspace/mareshkau/xulrunner-1.9.2/org.mozilla.xpcom/src/org/mozilla/interfaces/nsIXBLAccessible.java 2010-06-16 09:39:59 UTC (rev 22829)
+++ workspace/mareshkau/xulrunner-1.9.2/org.mozilla.xpcom/src/org/mozilla/interfaces/nsIXBLAccessible.java 2010-06-16 11:09:58 UTC (rev 22830)
@@ -1,22 +0,0 @@
-/*
- * DO NOT EDIT. THIS FILE IS GENERATED FROM
- * /builds/slave/mozilla-1.9.2-linux-xulrunner/build/accessible/public/nsIXBLAccessible.idl
- */
-
-package org.mozilla.interfaces;
-
-/**
- * XBL controls can implement this interface to provide own implementation of
- * accessible properties.
- */
-public interface nsIXBLAccessible extends nsISupports {
-
- String NS_IXBLACCESSIBLE_IID =
- "{3716eb86-166b-445b-a94a-9b522fee96e6}";
-
- /**
- * Return accessible name.
- */
- String getAccessibleName();
-
-}
\ No newline at end of file
15 years, 10 months
- 1
- 0