JBoss Tools SVN: r43495 - trunk/runtime/plugins/org.jboss.tools.runtime.core/src/org/jboss/tools/runtime/core/internal.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2012-09-07 02:02:08 -0400 (Fri, 07 Sep 2012)
New Revision: 43495
Modified:
trunk/runtime/plugins/org.jboss.tools.runtime.core/src/org/jboss/tools/runtime/core/internal/RuntimeExtensionManager.java
Log:
JBIDE-12559 extension point id was changed when extension was moved to core
Modified: trunk/runtime/plugins/org.jboss.tools.runtime.core/src/org/jboss/tools/runtime/core/internal/RuntimeExtensionManager.java
===================================================================
--- trunk/runtime/plugins/org.jboss.tools.runtime.core/src/org/jboss/tools/runtime/core/internal/RuntimeExtensionManager.java 2012-09-07 02:11:25 UTC (rev 43494)
+++ trunk/runtime/plugins/org.jboss.tools.runtime.core/src/org/jboss/tools/runtime/core/internal/RuntimeExtensionManager.java 2012-09-07 06:02:08 UTC (rev 43495)
@@ -39,7 +39,7 @@
public class RuntimeExtensionManager {
// Extension points
private static final String RUNTIME_DETECTOR_EXTENSION_ID = "org.jboss.tools.runtime.core.runtimeDetectors";
- public static final String DOWNLOAD_RUNTIMES_EXTENSION_ID = "org.jboss.tools.runtime.ui.downloadruntimes"; //$NON-NLS-1$
+ public static final String DOWNLOAD_RUNTIMES_EXTENSION_ID = "org.jboss.tools.runtime.core.downloadruntimes"; //$NON-NLS-1$
// JBoss Runtime files
private static final String DOWNLOAD_RUNTIMES_FILE = "download_runtime.xml"; //$NON-NLS-1$
13 years, 3 months
- 1
- 0
JBoss Tools SVN: r43494 - in trunk/runtime: plugins/org.jboss.tools.runtime.core/src/org/jboss/tools/runtime/core/internal and 7 other directories.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2012-09-06 22:11:25 -0400 (Thu, 06 Sep 2012)
New Revision: 43494
Added:
trunk/runtime/plugins/org.jboss.tools.runtime.core/src/org/jboss/tools/runtime/core/util/RuntimeInitializerUtil.java
trunk/runtime/plugins/org.jboss.tools.runtime.core/src/org/jboss/tools/runtime/core/util/RuntimeModelUtil.java
trunk/runtime/plugins/org.jboss.tools.runtime.core/src/org/jboss/tools/runtime/core/util/RuntimePathPreferenceIO.java
trunk/runtime/plugins/org.jboss.tools.runtime.ui/src/org/jboss/tools/runtime/ui/RuntimeCheckboxTreeViewer.java
trunk/runtime/plugins/org.jboss.tools.runtime.ui/src/org/jboss/tools/runtime/ui/RuntimeWorkbenchUtils.java
trunk/runtime/tests/org.jboss.tools.runtime.test/src/org/jboss/tools/runtime/test/RuntimePathUtilTest.java
Modified:
trunk/runtime/plugins/org.jboss.tools.runtime.core/src/org/jboss/tools/runtime/core/RuntimeCoreActivator.java
trunk/runtime/plugins/org.jboss.tools.runtime.core/src/org/jboss/tools/runtime/core/internal/RuntimeExtensionManager.java
trunk/runtime/plugins/org.jboss.tools.runtime.core/src/org/jboss/tools/runtime/core/model/IRuntimeDetectorDelegate.java
trunk/runtime/plugins/org.jboss.tools.runtime.ui/src/org/jboss/tools/runtime/ui/JBossRuntimeStartup.java
trunk/runtime/plugins/org.jboss.tools.runtime.ui/src/org/jboss/tools/runtime/ui/RuntimeScanner.java
trunk/runtime/plugins/org.jboss.tools.runtime.ui/src/org/jboss/tools/runtime/ui/RuntimeUIActivator.java
trunk/runtime/plugins/org.jboss.tools.runtime.ui/src/org/jboss/tools/runtime/ui/dialogs/SearchRuntimePathDialog.java
trunk/runtime/plugins/org.jboss.tools.runtime.ui/src/org/jboss/tools/runtime/ui/preferences/RuntimePreferencePage.java
trunk/runtime/tests/org.jboss.tools.runtime.test/src/org/jboss/tools/runtime/handlers/TestHandler1.java
trunk/runtime/tests/org.jboss.tools.runtime.test/src/org/jboss/tools/runtime/test/RuntimeDetectionAllTests.java
trunk/runtime/tests/org.jboss.tools.runtime.test/src/org/jboss/tools/runtime/test/RuntimeDetectionFrameworkTest.java
Log:
JBIDE-12559 JBIDE-12549 to trunk more runtime re-org
Modified: trunk/runtime/plugins/org.jboss.tools.runtime.core/src/org/jboss/tools/runtime/core/RuntimeCoreActivator.java
===================================================================
--- trunk/runtime/plugins/org.jboss.tools.runtime.core/src/org/jboss/tools/runtime/core/RuntimeCoreActivator.java 2012-09-07 01:01:45 UTC (rev 43493)
+++ trunk/runtime/plugins/org.jboss.tools.runtime.core/src/org/jboss/tools/runtime/core/RuntimeCoreActivator.java 2012-09-07 02:11:25 UTC (rev 43494)
@@ -35,7 +35,6 @@
private static RuntimeCoreActivator plugin;
// Member variables
- private Set<IRuntimeDetector> declaredRuntimeDetectors;
private Set<IRuntimeDetector> runtimeDetectors;
private Map<String, DownloadRuntime> downloadRuntimes;
@@ -95,7 +94,7 @@
}
public IRuntimeDetector findRuntimeDetector(String id) {
- for (IRuntimeDetector detector:getDeclaredRuntimeDetectors()) {
+ for (IRuntimeDetector detector:getRuntimeDetectors()) {
if (id.equals(detector.getId())) {
return detector;
}
@@ -103,24 +102,13 @@
return null;
}
- /*
- * Is this really necessary??
- *
- * getDeclaredRuntimeDetectors and getRuntimeDetectors
- * does almost exactly the same thing, except getRuntimeDetectors
- * sets the enablement and getDeclared... does not.
- *
- * Why would anyone require uninitialized detectors?
- * Couldn't they simply ignore the enabled flag?
- */
+ /* Please use getRuntimeDetectors */
+ @Deprecated
public Set<IRuntimeDetector> getDeclaredRuntimeDetectors() {
- if( declaredRuntimeDetectors == null) {
- declaredRuntimeDetectors = RuntimeExtensionManager.getDefault().loadDeclaredRuntimeDetectors();
- }
- return declaredRuntimeDetectors;
+ return getRuntimeDetectors();
}
- public Set<IRuntimeDetector> getRuntimeDetectors() {
+ public synchronized Set<IRuntimeDetector> getRuntimeDetectors() {
if (runtimeDetectors == null) {
runtimeDetectors = RuntimeExtensionManager.getDefault().loadInitializedRuntimeDetectors();
}
@@ -128,7 +116,7 @@
}
public void saveEnabledDetectors() {
- saveEnabledDetectors(getDeclaredRuntimeDetectors());
+ saveEnabledDetectors(getRuntimeDetectors());
}
public void saveEnabledDetectors(Set<IRuntimeDetector> allDetectors) {
Modified: trunk/runtime/plugins/org.jboss.tools.runtime.core/src/org/jboss/tools/runtime/core/internal/RuntimeExtensionManager.java
===================================================================
--- trunk/runtime/plugins/org.jboss.tools.runtime.core/src/org/jboss/tools/runtime/core/internal/RuntimeExtensionManager.java 2012-09-07 01:01:45 UTC (rev 43493)
+++ trunk/runtime/plugins/org.jboss.tools.runtime.core/src/org/jboss/tools/runtime/core/internal/RuntimeExtensionManager.java 2012-09-07 02:11:25 UTC (rev 43494)
@@ -82,7 +82,9 @@
boolean allEnabled = false;
if (enabledDetectors == null) {
allEnabled = true;
- }
+ }
+
+ enabledDetectors = (enabledDetectors == null ? new String[0] : enabledDetectors);
List<String> enabled = Arrays.asList(enabledDetectors);
for (IRuntimeDetector detector : set) {
boolean enableVal = allEnabled || enabled.contains(detector.getId());
Modified: trunk/runtime/plugins/org.jboss.tools.runtime.core/src/org/jboss/tools/runtime/core/model/IRuntimeDetectorDelegate.java
===================================================================
--- trunk/runtime/plugins/org.jboss.tools.runtime.core/src/org/jboss/tools/runtime/core/model/IRuntimeDetectorDelegate.java 2012-09-07 01:01:45 UTC (rev 43493)
+++ trunk/runtime/plugins/org.jboss.tools.runtime.core/src/org/jboss/tools/runtime/core/model/IRuntimeDetectorDelegate.java 2012-09-07 02:11:25 UTC (rev 43494)
@@ -5,6 +5,14 @@
import org.eclipse.core.runtime.IProgressMonitor;
+/**
+ * Runtime detectors and their delegates are *NOT* expected to maintain state.
+ * They are instantiated only once and may be given several requests,
+ * possibly concurrently.
+ *
+ * @author rob stryker
+ *
+ */
public interface IRuntimeDetectorDelegate {
/**
* The framework is asking you to create or otherwise initialize
Added: trunk/runtime/plugins/org.jboss.tools.runtime.core/src/org/jboss/tools/runtime/core/util/RuntimeInitializerUtil.java
===================================================================
--- trunk/runtime/plugins/org.jboss.tools.runtime.core/src/org/jboss/tools/runtime/core/util/RuntimeInitializerUtil.java (rev 0)
+++ trunk/runtime/plugins/org.jboss.tools.runtime.core/src/org/jboss/tools/runtime/core/util/RuntimeInitializerUtil.java 2012-09-07 02:11:25 UTC (rev 43494)
@@ -0,0 +1,50 @@
+package org.jboss.tools.runtime.core.util;
+
+import java.io.File;
+import java.util.List;
+import java.util.Set;
+
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.jboss.tools.runtime.core.JBossRuntimeLocator;
+import org.jboss.tools.runtime.core.RuntimeCoreActivator;
+import org.jboss.tools.runtime.core.model.IRuntimeDetector;
+import org.jboss.tools.runtime.core.model.RuntimeDefinition;
+import org.jboss.tools.runtime.core.model.RuntimePath;
+
+public class RuntimeInitializerUtil {
+ public static void initializeRuntimesFromFolder(File directory, IProgressMonitor monitor) {
+ if( directory != null && directory.isDirectory()) {
+ RuntimePath runtimePath = new RuntimePath(directory.getAbsolutePath());
+ List<RuntimeDefinition> runtimeDefinitions = createRuntimeDefinitions(runtimePath, monitor);
+ initializeRuntimes(runtimeDefinitions);
+ }
+ }
+
+ public static void initializeRuntimes(List<RuntimeDefinition> runtimeDefinitions) {
+ Set<IRuntimeDetector> detectors = RuntimeCoreActivator.getDefault().getRuntimeDetectors();
+ for( IRuntimeDetector detector:detectors) {
+ if (detector.isEnabled()) {
+ detector.initializeRuntimes(runtimeDefinitions);
+ }
+ }
+ }
+
+ public static void createRuntimeDefinitions(Set<RuntimePath> runtimePaths, IProgressMonitor monitor) {
+ for (RuntimePath runtimePath : runtimePaths) {
+ // TODO sub monitors
+ createRuntimeDefinitions(runtimePath, monitor);
+ }
+ }
+
+ public static List<RuntimeDefinition> createRuntimeDefinitions(RuntimePath runtimePath, IProgressMonitor monitor) {
+ JBossRuntimeLocator locator = new JBossRuntimeLocator();
+ List<RuntimeDefinition> runtimeDefinitions = locator
+ .searchForRuntimes(runtimePath.getPath(), monitor);
+ runtimePath.getRuntimeDefinitions().clear();
+ for (RuntimeDefinition runtimeDefinition : runtimeDefinitions) {
+ runtimeDefinition.setRuntimePath(runtimePath);
+ }
+ runtimePath.getRuntimeDefinitions().addAll(runtimeDefinitions);
+ return runtimeDefinitions;
+ }
+}
Added: trunk/runtime/plugins/org.jboss.tools.runtime.core/src/org/jboss/tools/runtime/core/util/RuntimeModelUtil.java
===================================================================
--- trunk/runtime/plugins/org.jboss.tools.runtime.core/src/org/jboss/tools/runtime/core/util/RuntimeModelUtil.java (rev 0)
+++ trunk/runtime/plugins/org.jboss.tools.runtime.core/src/org/jboss/tools/runtime/core/util/RuntimeModelUtil.java 2012-09-07 02:11:25 UTC (rev 43494)
@@ -0,0 +1,137 @@
+package org.jboss.tools.runtime.core.util;
+
+import java.io.BufferedInputStream;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.Enumeration;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Properties;
+import java.util.Set;
+import java.util.StringTokenizer;
+import java.util.TreeSet;
+
+import org.jboss.tools.runtime.core.RuntimeCoreActivator;
+import org.jboss.tools.runtime.core.model.IRuntimeDetector;
+import org.jboss.tools.runtime.core.model.RuntimeDefinition;
+import org.jboss.tools.runtime.core.model.RuntimePath;
+
+public class RuntimeModelUtil {
+ public static final String LINE_DELIMITER = "\n\r\f";//$NON-NLS-1$
+ public static final String IN_LINE_DELIMITER = ",";//$NON-NLS-1$
+
+ /**
+ * This class will read a properties file of the format:
+ * pathName=/some/path/to/jboss,true
+ *
+ * Where the path is a path to be scanned, and the
+ * following boolean is whether this should be scanned
+ * on every startup.
+ *
+ * @param file
+ * @return
+ */
+ public static Set<RuntimePath> parseRuntimeFile(File file) {
+ try {
+ return parseRuntimeFile(new BufferedInputStream(new FileInputStream(file)), false);
+ } catch(IOException ioe) {
+ RuntimeCoreActivator.getDefault().logError(ioe);
+ }
+ return new TreeSet<RuntimePath>();
+ }
+
+ /**
+ * This class will read an input stream of the format:
+ * pathName=/some/path/to/jboss,true
+ *
+ * Where the path is a path to be scanned, and the
+ * following boolean is whether this should be scanned
+ * on every startup.
+ *
+ * @param file
+ * @return
+ */
+ public static Set<RuntimePath> parseRuntimeFile(InputStream is, boolean includeMissing) {
+ final Set<RuntimePath> runtimePaths = new HashSet<RuntimePath>();
+ try {
+ Properties servers = new Properties();
+ servers.load(is);
+ Enumeration<Object> elements = servers.elements();
+ while (elements.hasMoreElements()) {
+ String str = (String) elements.nextElement();
+ StringTokenizer lineTokenizer =
+ new StringTokenizer(str,LINE_DELIMITER);
+ while (lineTokenizer.hasMoreTokens()) {
+ String lineToken = lineTokenizer.nextToken();
+ StringTokenizer tokenizer = new StringTokenizer(
+ lineToken, IN_LINE_DELIMITER);
+ if (tokenizer.countTokens() == 2) {
+ String location = tokenizer.nextToken();
+ boolean scan = Boolean.parseBoolean(tokenizer.nextToken());
+ File locationFile = new File(location);
+ if (locationFile.isDirectory() || (includeMissing && !locationFile.exists())) {
+ RuntimePath tempLocation = new RuntimePath(location);
+ tempLocation.setScanOnEveryStartup(scan);
+ runtimePaths.add(tempLocation);
+ }
+ }
+ }
+ }
+ } catch (IOException e) {
+ RuntimeCoreActivator.getDefault().logError(e);
+ }
+ return runtimePaths;
+ }
+
+ public static void updateTimestamps(Set<RuntimePath> runtimePaths2) {
+ for (RuntimePath runtimePath : runtimePaths2) {
+ String path = runtimePath.getPath();
+ if (path != null && !path.isEmpty()) {
+ File directory = new File(path);
+ if (directory.isDirectory()) {
+ runtimePath.setTimestamp(directory.lastModified());
+ }
+ }
+ }
+ }
+
+
+ public static boolean verifyRuntimeDefinitionCreated(RuntimeDefinition runtimeDefinition) {
+ return verifyRuntimeDefinitionCreated(runtimeDefinition, true);
+ }
+ public static boolean verifyRuntimeDefinitionCreated(RuntimeDefinition runtimeDefinition, boolean checkNested) {
+ Set<IRuntimeDetector> detectors = RuntimeCoreActivator.getDefault().getRuntimeDetectors();
+ return verifyRuntimeDefinitionCreated(runtimeDefinition, detectors, checkNested);
+ }
+ public static boolean verifyRuntimeDefinitionCreated(RuntimeDefinition runtimeDefinition,
+ Set<IRuntimeDetector> detectors, boolean checkNested) {
+ boolean created = false;
+ for (IRuntimeDetector detector:detectors) {
+ if (!detector.isEnabled()) {
+ continue;
+ }
+ if (detector.exists(runtimeDefinition)) {
+ if( !checkNested ) {
+ created = true;
+ } else {
+ List<RuntimeDefinition> includedDefinitions = runtimeDefinition.getIncludedRuntimeDefinitions();
+ boolean includedCreated = true;
+ for (RuntimeDefinition includedDefinition:includedDefinitions) {
+ if (!verifyRuntimeDefinitionCreated(includedDefinition)) {
+ includedCreated = false;
+ break;
+ }
+ }
+ if (includedCreated) {
+ created = true;
+ break;
+ }
+ }
+ }
+ }
+ return (created);
+ }
+
+}
Added: trunk/runtime/plugins/org.jboss.tools.runtime.core/src/org/jboss/tools/runtime/core/util/RuntimePathPreferenceIO.java
===================================================================
--- trunk/runtime/plugins/org.jboss.tools.runtime.core/src/org/jboss/tools/runtime/core/util/RuntimePathPreferenceIO.java (rev 0)
+++ trunk/runtime/plugins/org.jboss.tools.runtime.core/src/org/jboss/tools/runtime/core/util/RuntimePathPreferenceIO.java 2012-09-07 02:11:25 UTC (rev 43494)
@@ -0,0 +1,180 @@
+package org.jboss.tools.runtime.core.util;
+
+import java.io.BufferedInputStream;
+import java.io.BufferedOutputStream;
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Set;
+
+import org.jboss.tools.common.xml.IMemento;
+import org.jboss.tools.common.xml.XMLMemento;
+import org.jboss.tools.runtime.core.RuntimeCoreActivator;
+import org.jboss.tools.runtime.core.model.IRuntimeDetector;
+import org.jboss.tools.runtime.core.model.RuntimeDefinition;
+import org.jboss.tools.runtime.core.model.RuntimePath;
+
+public class RuntimePathPreferenceIO {
+ private static final String RUNTIME_PATHS = "runtimePaths";
+ private static final String PATH = "path";
+ private static final String RUNTIME_PATH = "runtimePath";
+ private static final String SCAN_ON_EVERY_STAERTUP = "scanOnEveryStartup";
+ private static final String TIMESTAMP = "timestamp";
+ private static final String SERVER_DEFINITIONS = "serverDefinitions";
+ private static final String SERVER_DEFINITION = "serverDefinition";
+ private static final String NAME = "name";
+ private static final String INCLUDED_DEFINITION = "included";
+ private static final String VERSION = "version";
+ private static final String TYPE = "type";
+ private static final String LOCATION = "location";
+ private static final String DESCRIPTION = "description";
+ private static final String ENABLED = "enabled";
+ public static final String FIRST_START = "firstStart"; //$NON-NLS-1$
+ public static final String PREFERENCES_VERSION = "version"; //$NON-NLS-1$
+ private static final String RUNTIME_PREFERENCES_VERSION = "2"; //$NON-NLS-1$
+
+ public static String getPreferenceOutputString(Set<RuntimePath> runtimePaths) throws IOException {
+ XMLMemento memento = XMLMemento.createWriteRoot(RUNTIME_PATHS);
+ memento.putString(PREFERENCES_VERSION, RUNTIME_PREFERENCES_VERSION);
+ for (RuntimePath runtimePath:runtimePaths) {
+ IMemento runtimePathNode = memento.createChild(RUNTIME_PATH);
+ runtimePathNode.putString(PATH, runtimePath.getPath());
+ runtimePathNode.putBoolean(SCAN_ON_EVERY_STAERTUP, runtimePath.isScanOnEveryStartup());
+ runtimePathNode.putString(TIMESTAMP, String.valueOf(runtimePath.getTimestamp()));
+ IMemento serverDefinitionsNode = runtimePathNode.createChild(SERVER_DEFINITIONS);
+ List<RuntimeDefinition> definitions = runtimePath.getRuntimeDefinitions();
+ putDefinitions(serverDefinitionsNode, definitions);
+ }
+
+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
+ BufferedOutputStream os = new BufferedOutputStream(baos);
+ try {
+ memento.save(os);
+ os.flush();
+ String runtimes = baos.toString();
+ return runtimes;
+ } finally {
+ if (os != null) {
+ try {
+ os.close();
+ } catch (IOException e) {
+ // ignore
+ }
+ }
+ }
+ }
+
+ private static void putDefinitions(IMemento runtimeDefintionsNode,
+ List<RuntimeDefinition> definitions) {
+ for (RuntimeDefinition runtimeDefinition:definitions) {
+ IMemento sdNode = runtimeDefintionsNode.createChild(SERVER_DEFINITION);
+ putRuntimeDefinition(runtimeDefinition, sdNode);
+ IMemento includedNodes = sdNode.createChild(INCLUDED_DEFINITION);
+ for (RuntimeDefinition included:runtimeDefinition.getIncludedRuntimeDefinitions()) {
+ IMemento includedNode = includedNodes.createChild(SERVER_DEFINITION);
+ putRuntimeDefinition(included, includedNode);
+ }
+ }
+ }
+
+ private static void putRuntimeDefinition(RuntimeDefinition runtimeDefinition,
+ IMemento node) {
+ node.putString(NAME, runtimeDefinition.getName());
+ node.putString(VERSION, runtimeDefinition.getVersion());
+ node.putString(TYPE, runtimeDefinition.getType());
+ node.putString(LOCATION, runtimeDefinition.getLocation().getAbsolutePath());
+ node.putString(DESCRIPTION, runtimeDefinition.getDescription());
+ node.putBoolean(ENABLED, runtimeDefinition.isEnabled());
+ }
+
+ public static Set<RuntimePath> loadRuntimePathsFromPreferenceString(String preferenceString) {
+ HashSet<RuntimePath> runtimePaths = new HashSet<RuntimePath>();
+ if (preferenceString == null || preferenceString.isEmpty()) {
+ return runtimePaths;
+ }
+ InputStream is = new BufferedInputStream(new ByteArrayInputStream(preferenceString.getBytes()));
+ XMLMemento memento = XMLMemento.createReadRoot(is);
+
+ // If there's no preference version declared, it's version 1,
+ // which requires computing the nested runtimes, since
+ // they are not stored in the model
+ String preferencesVersion = memento.getString(PREFERENCES_VERSION);
+ boolean computeIncluded = preferencesVersion == null;
+
+
+ IMemento[] nodes = memento.getChildren(RUNTIME_PATH);
+ for (IMemento node:nodes) {
+ String path = node.getString(PATH);
+ boolean scanOnEveryStartup = node.getBoolean(SCAN_ON_EVERY_STAERTUP);
+ String tsString = node.getString(TIMESTAMP);
+ Long timestamp = null;
+ try {
+ timestamp = new Long(tsString);
+ } catch (NumberFormatException e) {
+ // ignore
+ }
+ RuntimePath runtimePath = new RuntimePath(path);
+ runtimePath.setScanOnEveryStartup(scanOnEveryStartup);
+ if (timestamp != null) {
+ runtimePath.setTimestamp(timestamp);
+ }
+ IMemento serverDefinitionsNode = node.getChild(SERVER_DEFINITIONS);
+ IMemento[] sdNodes = serverDefinitionsNode.getChildren(SERVER_DEFINITION);
+ for (IMemento sdNode:sdNodes) {
+ RuntimeDefinition serverDefinition = createRuntimeDefinition(sdNode);
+ serverDefinition.setRuntimePath(runtimePath);
+ IMemento includedDefinition = sdNode.getChild(INCLUDED_DEFINITION);
+ if (includedDefinition != null) {
+ IMemento[] includedNodes = includedDefinition
+ .getChildren(SERVER_DEFINITION);
+ for (IMemento includedNode : includedNodes) {
+ RuntimeDefinition included = createRuntimeDefinition(includedNode);
+ included.setRuntimePath(runtimePath);
+ included.setParent(serverDefinition);
+ serverDefinition.getIncludedRuntimeDefinitions().add(
+ included);
+ }
+ }
+ runtimePath.getRuntimeDefinitions().add(serverDefinition);
+ }
+ runtimePaths.add(runtimePath);
+ }
+ if (computeIncluded) {
+ for(RuntimeDefinition definition:getAllRuntimeDefinitions(runtimePaths)) {
+ Set<IRuntimeDetector> detectors = RuntimeCoreActivator.getDefault().getRuntimeDetectors();
+ for (IRuntimeDetector detector:detectors) {
+ detector.computeIncludedRuntimeDefinition(definition);
+ }
+ }
+ }
+ return runtimePaths;
+ }
+
+ private static RuntimeDefinition createRuntimeDefinition(IMemento node) {
+ String name = node.getString(NAME);
+ String version = node.getString(VERSION);
+ String type = node.getString(TYPE);
+ String location = node.getString(LOCATION);
+ String description = node.getString(DESCRIPTION);
+ boolean enabled = node.getBoolean(ENABLED);
+ RuntimeDefinition runtimeDefinition =
+ new RuntimeDefinition(name, version, type, new File(location));
+ runtimeDefinition.setDescription(description);
+ runtimeDefinition.setEnabled(enabled);
+ return runtimeDefinition;
+ }
+
+ private static List<RuntimeDefinition> getAllRuntimeDefinitions(Set<RuntimePath> paths) {
+ List<RuntimeDefinition> defs = new ArrayList<RuntimeDefinition>();
+ for( Iterator<RuntimePath> i = paths.iterator(); i.hasNext(); ) {
+ defs.addAll(i.next().getRuntimeDefinitions());
+ }
+ return defs;
+ }
+}
Modified: trunk/runtime/plugins/org.jboss.tools.runtime.ui/src/org/jboss/tools/runtime/ui/JBossRuntimeStartup.java
===================================================================
--- trunk/runtime/plugins/org.jboss.tools.runtime.ui/src/org/jboss/tools/runtime/ui/JBossRuntimeStartup.java 2012-09-07 01:01:45 UTC (rev 43493)
+++ trunk/runtime/plugins/org.jboss.tools.runtime.ui/src/org/jboss/tools/runtime/ui/JBossRuntimeStartup.java 2012-09-07 02:11:25 UTC (rev 43494)
@@ -10,18 +10,11 @@
******************************************************************************/
package org.jboss.tools.runtime.ui;
-import java.io.BufferedInputStream;
import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
import java.io.IOException;
import java.net.URL;
-import java.util.Enumeration;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Properties;
import java.util.Set;
-import java.util.StringTokenizer;
+import java.util.TreeSet;
import org.eclipse.core.runtime.FileLocator;
import org.eclipse.core.runtime.IProgressMonitor;
@@ -31,12 +24,13 @@
import org.eclipse.ui.IViewPart;
import org.eclipse.ui.PlatformUI;
import org.eclipse.ui.navigator.CommonNavigator;
-import org.jboss.tools.runtime.core.JBossRuntimeLocator;
-import org.jboss.tools.runtime.core.RuntimeCoreActivator;
-import org.jboss.tools.runtime.core.model.IRuntimeDetector;
-import org.jboss.tools.runtime.core.model.RuntimeDefinition;
import org.jboss.tools.runtime.core.model.RuntimePath;
+import org.jboss.tools.runtime.core.util.RuntimeInitializerUtil;
+import org.jboss.tools.runtime.core.util.RuntimeModelUtil;
+/**
+ * This class is only run on the first start of the product
+ */
public class JBossRuntimeStartup {
private static final String JBOSS_EAP_HOME = "../../runtimes/jboss-eap"; // JBoss EAP home directory (relative to plugin)- <RHDS_HOME>/jbossas. //$NON-NLS-1$
@@ -45,71 +39,44 @@
private static final String LOCATIONS_FILE_CONFIGURATION = "../../studio/" + LOCATIONS_FILE_NAME; //$NON-NLS-1$
public static void initializeRuntimes(IProgressMonitor monitor) {
- JBossRuntimeLocator locator = new JBossRuntimeLocator();
- try {
- String configuration = getConfiguration();
- File directory = new File(configuration, JBOSS_EAP_HOME);
- if (directory.isDirectory()) {
- RuntimePath runtimePath = new RuntimePath(
- directory.getAbsolutePath());
- List<RuntimeDefinition> runtimeDefinitions = locator
- .searchForRuntimes(runtimePath.getPath(), monitor);
- runtimePath.getRuntimeDefinitions().clear();
- for (RuntimeDefinition serverDefinition : runtimeDefinitions) {
- serverDefinition.setRuntimePath(runtimePath);
- }
- initializeRuntimes(runtimeDefinitions);
- }
- } catch (IOException e) {
- RuntimeUIActivator.log(e);
- }
+ initializeEAPRuntimes(monitor);
+ initializeRuntimesFromDefinitionFile(monitor);
+ }
+
+ private static void initializeEAPRuntimes(IProgressMonitor monitor) {
+ File directory = getEAPDirectory();
+ RuntimeInitializerUtil.initializeRuntimesFromFolder(directory, monitor);
+ RuntimeWorkbenchUtils.refreshServersView(); // ?!?!
+ }
+
+ private static void initializeRuntimesFromDefinitionFile(IProgressMonitor monitor) {
final Set<RuntimePath> runtimePaths = parseRuntimeLocationsFile();
for (RuntimePath runtimePath : runtimePaths) {
- List<RuntimeDefinition> serverDefinitions = locator
- .searchForRuntimes(runtimePath.getPath(), monitor);
- runtimePath.getRuntimeDefinitions().clear();
- for (RuntimeDefinition serverDefinition : serverDefinitions) {
- serverDefinition.setRuntimePath(runtimePath);
- }
- runtimePath.getRuntimeDefinitions().addAll(serverDefinitions);
+ RuntimeInitializerUtil.createRuntimeDefinitions(runtimePath, monitor);
}
+
if (runtimePaths.size() > 0) {
- RuntimeUIActivator.getDefault().getRuntimePaths()
- .addAll(runtimePaths);
+ RuntimeUIActivator.getDefault().getRuntimePaths().addAll(runtimePaths);
RuntimeUIActivator.getDefault().saveRuntimePaths();
}
}
- public static void initializeRuntimes(List<RuntimeDefinition> serverDefinitions) {
- Set<IRuntimeDetector> detectors = RuntimeCoreActivator.getDefault().getRuntimeDetectors();
- for( IRuntimeDetector detector:detectors) {
- if (detector.isEnabled()) {
- detector.initializeRuntimes(serverDefinitions);
- }
+ private static File getEAPDirectory() {
+ try {
+ String configuration = getConfiguration();
+ File directory = new File(configuration, JBOSS_EAP_HOME);
+ return directory;
+ } catch( IOException ioe) {
+ RuntimeUIActivator.log(ioe);
}
- refreshCommonNavigator();
+ return null;
}
- private static void refreshCommonNavigator() {
- // https://jira.jboss.org/jira/browse/JBDS-1091
- Display.getDefault().asyncExec(new Runnable() {
-
- public void run() {
- IViewPart view = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().findView("org.eclipse.wst.server.ui.ServersView");
- if (view instanceof CommonNavigator) {
- CommonNavigator navigator = (CommonNavigator) view;
- navigator.getCommonViewer().refresh();
- }
- }
- });
- }
-
- private static Set<RuntimePath> parseRuntimeLocationsFile() {
- final Set<RuntimePath> runtimePaths = new HashSet<RuntimePath>();
+ private static File findRuntimeFile() {
try {
String pluginLocation = FileLocator.resolve(RuntimeUIActivator.getDefault().getBundle().getEntry("/")).getPath(); //$NON-NLS-1$
File serversFile = new File(pluginLocation, LOCATIONS_FILE);
-
+
if (!serversFile.isFile()) {
String configuration = getConfiguration();
serversFile = new File(configuration, LOCATIONS_FILE_CONFIGURATION).getCanonicalFile();
@@ -120,39 +87,22 @@
serversFile = new File(pluginLocation,LOCATIONS_FILE_NAME);
}
if (serversFile.isFile()) {
- //String str = FileUtil.readFile(serversFile);
- Properties servers = new Properties();
- servers.load(new BufferedInputStream(new FileInputStream(serversFile)));
- Enumeration<Object> elements = servers.elements();
- while (elements.hasMoreElements()) {
- String str = (String) elements.nextElement();
- StringTokenizer lineTokenizer = new StringTokenizer(str,
- "\n\r\f"); //$NON-NLS-1$
- while (lineTokenizer.hasMoreTokens()) {
- String lineToken = lineTokenizer.nextToken();
- StringTokenizer tokenizer = new StringTokenizer(
- lineToken, ","); //$NON-NLS-1$
- if (tokenizer.countTokens() == 2) {
- String location = tokenizer.nextToken();
- boolean scan = Boolean.parseBoolean(tokenizer.nextToken());
- File locationFile = new File(location);
- if (locationFile.isDirectory()) {
- RuntimePath tempLocation = new RuntimePath(location);
- tempLocation.setScanOnEveryStartup(scan);
- runtimePaths.add(tempLocation);
- }
- }
- }
- }
+ return serversFile;
}
- } catch (FileNotFoundException e) {
- RuntimeUIActivator.log(e);
- } catch (IOException e) {
- RuntimeUIActivator.log(e);
+ } catch(IOException ioe) {
+ RuntimeUIActivator.log(ioe);
}
- return runtimePaths;
+ return null;
}
-
+
+ private static Set<RuntimePath> parseRuntimeLocationsFile() {
+ File runtimeFile = findRuntimeFile();
+ if( runtimeFile != null && runtimeFile.isFile()) {
+ return RuntimeModelUtil.parseRuntimeFile(runtimeFile);
+ }
+ return new TreeSet<RuntimePath>();
+ }
+
private static String getConfiguration() throws IOException {
Location configLocation = Platform.getConfigurationLocation();
URL configURL = configLocation.getURL();
Added: trunk/runtime/plugins/org.jboss.tools.runtime.ui/src/org/jboss/tools/runtime/ui/RuntimeCheckboxTreeViewer.java
===================================================================
--- trunk/runtime/plugins/org.jboss.tools.runtime.ui/src/org/jboss/tools/runtime/ui/RuntimeCheckboxTreeViewer.java (rev 0)
+++ trunk/runtime/plugins/org.jboss.tools.runtime.ui/src/org/jboss/tools/runtime/ui/RuntimeCheckboxTreeViewer.java 2012-09-07 02:11:25 UTC (rev 43494)
@@ -0,0 +1,54 @@
+package org.jboss.tools.runtime.ui;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Set;
+
+import org.eclipse.jface.dialogs.Dialog;
+import org.eclipse.jface.viewers.CheckboxTreeViewer;
+import org.eclipse.jface.viewers.TreeViewerColumn;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.graphics.FontMetrics;
+import org.eclipse.swt.graphics.GC;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Tree;
+import org.jboss.tools.runtime.core.model.RuntimeDefinition;
+import org.jboss.tools.runtime.core.model.RuntimePath;
+
+public class RuntimeCheckboxTreeViewer extends CheckboxTreeViewer {
+ public RuntimeCheckboxTreeViewer(Composite parent, final Set<RuntimePath> runtimePaths2, int heightHint) {
+ super(parent, SWT.V_SCROLL | SWT.BORDER | SWT.FULL_SELECTION | SWT.SINGLE);
+
+ GridData gd;
+ Tree tree = getTree();
+ gd = new GridData(SWT.FILL, SWT.FILL, true, true);
+ GC gc = new GC( parent);
+ FontMetrics fontMetrics = gc.getFontMetrics( );
+ gc.dispose( );
+ gd.minimumHeight = Dialog.convertHeightInCharsToPixels(fontMetrics, heightHint);
+ tree.setLayoutData(gd);
+ tree.setHeaderVisible(true);
+ tree.setLinesVisible(true);
+
+ String[] columnNames = new String[] { "Name", "Version", "Type", "Location"};
+ int[] columnWidths = new int[] {300, 100, 50, 200};
+
+ for (int i = 0; i < columnNames.length; i++) {
+ TreeViewerColumn tc = new TreeViewerColumn(this, SWT.NONE);
+ tc.getColumn().setText(columnNames[i]);
+ tc.getColumn().setWidth(columnWidths[i]);
+ }
+
+ setLabelProvider(new RuntimeLabelProvider());
+ List<RuntimeDefinition> runtimeDefinitions = new ArrayList<RuntimeDefinition>();
+ for (RuntimePath runtimePath:runtimePaths2) {
+ runtimeDefinitions.addAll(runtimePath.getRuntimeDefinitions());
+ }
+ setContentProvider(new RuntimeContentProvider(runtimeDefinitions));
+ setInput(runtimeDefinitions);
+ for (RuntimeDefinition definition:runtimeDefinitions) {
+ setChecked(definition, definition.isEnabled());
+ }
+ }
+}
Modified: trunk/runtime/plugins/org.jboss.tools.runtime.ui/src/org/jboss/tools/runtime/ui/RuntimeScanner.java
===================================================================
--- trunk/runtime/plugins/org.jboss.tools.runtime.ui/src/org/jboss/tools/runtime/ui/RuntimeScanner.java 2012-09-07 01:01:45 UTC (rev 43493)
+++ trunk/runtime/plugins/org.jboss.tools.runtime.ui/src/org/jboss/tools/runtime/ui/RuntimeScanner.java 2012-09-07 02:11:25 UTC (rev 43494)
@@ -24,9 +24,9 @@
import org.eclipse.swt.widgets.Shell;
import org.eclipse.ui.IStartup;
import org.eclipse.ui.PlatformUI;
-import org.jboss.tools.runtime.core.JBossRuntimeLocator;
+import org.jboss.tools.runtime.core.model.RuntimeDefinition;
import org.jboss.tools.runtime.core.model.RuntimePath;
-import org.jboss.tools.runtime.core.model.RuntimeDefinition;
+import org.jboss.tools.runtime.core.util.RuntimeInitializerUtil;
/**
* @author snjeza
@@ -36,15 +36,10 @@
@Override
public void earlyStartup() {
- String skipRuntimeScanner = System.getProperty("skip.runtime.scanner", "false");
- if ("true".equals(skipRuntimeScanner)) {
+ if( Boolean.getBoolean("skip.runtime.scanner"))
return;
- }
- boolean firstStartWorkspace = RuntimeUIActivator.getDefault().
- getPreferenceStore().getBoolean(RuntimeUIActivator.FIRST_START);
- IEclipsePreferences configurationNode = ConfigurationScope.INSTANCE.getNode(RuntimeUIActivator.PLUGIN_ID);
- boolean firstStartConfiguration = configurationNode.getBoolean(RuntimeUIActivator.FIRST_START, true);
- final boolean firstStart = firstStartWorkspace || firstStartConfiguration;
+
+ final boolean firstStart = isFirstStart();
Job runtimeJob = new Job("Searching runtimes...") {
@Override
@@ -81,10 +76,25 @@
runtimeJob.setPriority(Job.LONG);
runtimeJob.schedule(1000);
+ setFirstStartFalse();
+ }
+
+
+ private boolean isFirstStart() {
+ boolean firstStartWorkspace = RuntimeUIActivator.getDefault().
+ getPreferenceStore().getBoolean(RuntimeUIActivator.FIRST_START);
+ IEclipsePreferences configurationNode = ConfigurationScope.INSTANCE.getNode(RuntimeUIActivator.PLUGIN_ID);
+ boolean firstStartConfiguration = configurationNode.getBoolean(RuntimeUIActivator.FIRST_START, true);
+ final boolean firstStart = firstStartWorkspace || firstStartConfiguration;
+ return firstStart;
+ }
+
+ private void setFirstStartFalse() {
+ IEclipsePreferences configurationNode = ConfigurationScope.INSTANCE.getNode(RuntimeUIActivator.PLUGIN_ID);
+ configurationNode.putBoolean(RuntimeUIActivator.FIRST_START, false);
RuntimeUIActivator.getDefault().getPreferenceStore().setValue(RuntimeUIActivator.FIRST_START, false);
- configurationNode.putBoolean(RuntimeUIActivator.FIRST_START, false);
}
-
+
private boolean runtimeExists(boolean firstStart, IProgressMonitor monitor) {
Set<RuntimePath> runtimePaths = RuntimeUIActivator.getDefault().getRuntimePaths();
for (RuntimePath runtimePath:runtimePaths) {
@@ -95,29 +105,20 @@
return false;
}
if (runtimePath.isModified()) {
- JBossRuntimeLocator locator = new JBossRuntimeLocator();
- List<RuntimeDefinition> serverDefinitions = locator.searchForRuntimes(runtimePath.getPath(), monitor);
- if (monitor.isCanceled()) {
- return false;
- }
- runtimePath.getRuntimeDefinitions().clear();
- for (RuntimeDefinition serverDefinition:serverDefinitions) {
- serverDefinition.setRuntimePath(runtimePath);
- }
- runtimePath.getRuntimeDefinitions().addAll(serverDefinitions);
+ RuntimeInitializerUtil.createRuntimeDefinitions(runtimePath, monitor);
RuntimeUIActivator.setTimestamp(runtimePaths);
}
monitor.setTaskName("JBoss Runtime Detector: checking " + runtimePath.getPath());
- List<RuntimeDefinition> serverDefinitions = runtimePath.getRuntimeDefinitions();
- for (RuntimeDefinition serverDefinition:serverDefinitions) {
+ List<RuntimeDefinition> runtimeDefinitions = runtimePath.getRuntimeDefinitions();
+ for (RuntimeDefinition runtimeDefinition:runtimeDefinitions) {
if (monitor.isCanceled()) {
return false;
}
- if (!serverDefinition.isEnabled()) {
+ if (!runtimeDefinition.isEnabled()) {
continue;
}
- monitor.setTaskName("JBoss Runtime Detector: checking " + serverDefinition.getLocation());
- if (!RuntimeUIActivator.runtimeCreated(serverDefinition)) {
+ monitor.setTaskName("JBoss Runtime Detector: checking " + runtimeDefinition.getLocation());
+ if (!RuntimeUIActivator.runtimeCreated(runtimeDefinition)) {
return true;
}
}
Modified: trunk/runtime/plugins/org.jboss.tools.runtime.ui/src/org/jboss/tools/runtime/ui/RuntimeUIActivator.java
===================================================================
--- trunk/runtime/plugins/org.jboss.tools.runtime.ui/src/org/jboss/tools/runtime/ui/RuntimeUIActivator.java 2012-09-07 01:01:45 UTC (rev 43493)
+++ trunk/runtime/plugins/org.jboss.tools.runtime.ui/src/org/jboss/tools/runtime/ui/RuntimeUIActivator.java 2012-09-07 02:11:25 UTC (rev 43494)
@@ -10,12 +10,6 @@
************************************************************************************/
package org.jboss.tools.runtime.ui;
-import java.io.File;
-import java.io.IOException;
-import java.io.Reader;
-import java.io.StringReader;
-import java.io.StringWriter;
-import java.io.Writer;
import java.lang.reflect.InvocationTargetException;
import java.util.ArrayList;
import java.util.HashSet;
@@ -28,35 +22,23 @@
import org.eclipse.core.runtime.Status;
import org.eclipse.core.runtime.preferences.ConfigurationScope;
import org.eclipse.core.runtime.preferences.IEclipsePreferences;
-import org.eclipse.jface.dialogs.Dialog;
import org.eclipse.jface.operation.IRunnableWithProgress;
-import org.eclipse.jface.preference.PreferenceDialog;
import org.eclipse.jface.viewers.CheckboxTreeViewer;
-import org.eclipse.jface.viewers.TreeViewerColumn;
-import org.eclipse.swt.SWT;
import org.eclipse.swt.events.DisposeEvent;
import org.eclipse.swt.events.DisposeListener;
-import org.eclipse.swt.graphics.FontMetrics;
-import org.eclipse.swt.graphics.GC;
-import org.eclipse.swt.layout.GridData;
import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Display;
import org.eclipse.swt.widgets.Shell;
-import org.eclipse.swt.widgets.Tree;
-import org.eclipse.ui.IMemento;
-import org.eclipse.ui.PlatformUI;
import org.eclipse.ui.WorkbenchException;
-import org.eclipse.ui.XMLMemento;
-import org.eclipse.ui.dialogs.PreferencesUtil;
import org.eclipse.ui.plugin.AbstractUIPlugin;
-import org.jboss.tools.runtime.core.JBossRuntimeLocator;
import org.jboss.tools.runtime.core.RuntimeCoreActivator;
import org.jboss.tools.runtime.core.model.IRuntimeDetector;
import org.jboss.tools.runtime.core.model.RuntimeDefinition;
import org.jboss.tools.runtime.core.model.RuntimePath;
+import org.jboss.tools.runtime.core.util.RuntimeInitializerUtil;
+import org.jboss.tools.runtime.core.util.RuntimeModelUtil;
+import org.jboss.tools.runtime.core.util.RuntimePathPreferenceIO;
import org.jboss.tools.runtime.ui.dialogs.SearchRuntimePathDialog;
import org.jboss.tools.runtime.ui.download.DownloadRuntimes;
-import org.jboss.tools.runtime.ui.preferences.RuntimePreferencePage;
import org.osgi.framework.BundleContext;
/**
@@ -84,38 +66,16 @@
public static final String RUNTIME_PATH = "runtimePath";
public static final String SCAN_ON_EVERY_STAERTUP = "scanOnEveryStartup";
-
- public static final String TIMESTAMP = "timestamp";
- private static final String SERVER_DEFINITIONS = "serverDefinitions";
-
- private static final String SERVER_DEFINITION = "serverDefinition";
-
- private static final String NAME = "name";
-
- private static final String INCLUDED_DEFINITION = "included";
-
- private static final String VERSION = "version";
-
- private static final String TYPE = "type";
-
- private static final String LOCATION = "location";
-
- private static final String DESCRIPTION = "description";
-
- private static final String ENABLED = "enabled";
-
public static final String FIRST_START = "firstStart"; //$NON-NLS-1$
public static final String PREFERENCES_VERSION = "version"; //$NON-NLS-1$
-
- private static final String RUNTIME_PREFERENCES_VERSION = "2"; //$NON-NLS-1$
private BundleContext context;
private Set<RuntimePath> runtimePaths = new HashSet<RuntimePath>();
- private List<RuntimeDefinition> serverDefinitions;
+ private List<RuntimeDefinition> runtimeDefinitions;
private ListenerList runtimePathChangeChangeListeners;
@@ -174,59 +134,14 @@
}
public static CheckboxTreeViewer createRuntimeViewer(final Set<RuntimePath> runtimePaths2, Composite composite, int heightHint) {
- GridData gd;
- CheckboxTreeViewer viewer = new CheckboxTreeViewer(composite, SWT.V_SCROLL
- | SWT.BORDER | SWT.FULL_SELECTION | SWT.SINGLE);
-
- Tree tree = viewer.getTree();
- gd = new GridData(SWT.FILL, SWT.FILL, true, true);
- GC gc = new GC( composite);
- FontMetrics fontMetrics = gc.getFontMetrics( );
- gc.dispose( );
- gd.minimumHeight = Dialog.convertHeightInCharsToPixels(fontMetrics, heightHint);
- tree.setLayoutData(gd);
- tree.setHeaderVisible(true);
- tree.setLinesVisible(true);
-
- String[] columnNames = new String[] { "Name", "Version", "Type", "Location"};
- int[] columnWidths = new int[] {300, 100, 50, 200};
-
- for (int i = 0; i < columnNames.length; i++) {
- TreeViewerColumn tc = new TreeViewerColumn(viewer, SWT.NONE);
- tc.getColumn().setText(columnNames[i]);
- tc.getColumn().setWidth(columnWidths[i]);
- }
-
- viewer.setLabelProvider(new RuntimeLabelProvider());
- List<RuntimeDefinition> serverDefinitions = new ArrayList<RuntimeDefinition>();
- for (RuntimePath runtimePath:runtimePaths2) {
- serverDefinitions.addAll(runtimePath.getRuntimeDefinitions());
- }
- viewer.setContentProvider(new RuntimeContentProvider(serverDefinitions));
- viewer.setInput(serverDefinitions);
- for (RuntimeDefinition definition:serverDefinitions) {
- viewer.setChecked(definition, definition.isEnabled());
- }
- return viewer;
+ return new RuntimeCheckboxTreeViewer(composite, runtimePaths2, heightHint);
}
public static void refreshRuntimes(Shell shell, final Set<RuntimePath> runtimePaths, final CheckboxTreeViewer viewer, boolean needRefresh, int heightHint) {
IRunnableWithProgress op = new IRunnableWithProgress() {
-
- @Override
- public void run(IProgressMonitor monitor) throws InvocationTargetException,
- InterruptedException {
- JBossRuntimeLocator locator = new JBossRuntimeLocator();
- for (RuntimePath runtimePath : runtimePaths) {
- List<RuntimeDefinition> serverDefinitions = locator
- .searchForRuntimes(runtimePath.getPath(), monitor);
- runtimePath.getRuntimeDefinitions().clear();
- for (RuntimeDefinition serverDefinition : serverDefinitions) {
- serverDefinition.setRuntimePath(runtimePath);
- }
- runtimePath.getRuntimeDefinitions()
- .addAll(serverDefinitions);
- }
+ public void run(IProgressMonitor monitor)
+ throws InvocationTargetException, InterruptedException {
+ RuntimeInitializerUtil.createRuntimeDefinitions(runtimePaths, monitor);
}
};
try {
@@ -238,12 +153,12 @@
@Override
public void widgetDisposed(DisposeEvent e) {
viewer.setInput(null);
- List<RuntimeDefinition> serverDefinitions = new ArrayList<RuntimeDefinition>();
+ List<RuntimeDefinition> runtimeDefinitions = new ArrayList<RuntimeDefinition>();
for (RuntimePath runtimePath : runtimePaths) {
- serverDefinitions.addAll(runtimePath
+ runtimeDefinitions.addAll(runtimePath
.getRuntimeDefinitions());
- viewer.setInput(serverDefinitions);
- for (RuntimeDefinition serverDefinition : serverDefinitions) {
+ viewer.setInput(runtimeDefinitions);
+ for (RuntimeDefinition serverDefinition : runtimeDefinitions) {
runtimeExists(serverDefinition);
viewer.setChecked(serverDefinition,
serverDefinition.isEnabled());
@@ -259,109 +174,23 @@
}
}
- public static boolean runtimeExists(RuntimeDefinition serverDefinition) {
- Set<IRuntimeDetector> detectors = RuntimeCoreActivator.getDefault().getRuntimeDetectors();
- for (IRuntimeDetector detector:detectors) {
- if (detector.isEnabled() && detector.exists(serverDefinition)) {
- return true;
- }
- }
- return false;
+ public static boolean runtimeExists(RuntimeDefinition runtimeDefinition) {
+ return RuntimeModelUtil.verifyRuntimeDefinitionCreated(runtimeDefinition, false);
}
- public static void refreshPreferencePage(Shell shell) {
- Shell mainShell = PlatformUI.getWorkbench().getActiveWorkbenchWindow()
- .getShell();
- if (shell != null && !shell.isDisposed()) {
- shell.close();
- }
- shell = Display.getCurrent().getActiveShell();
- if (shell != mainShell && shell != null) {
- shell.close();
- }
- PreferenceDialog preferenceDialog = PreferencesUtil
- .createPreferenceDialogOn(PlatformUI.getWorkbench()
- .getActiveWorkbenchWindow().getShell(),
- RuntimePreferencePage.ID, null, null);
- preferenceDialog.open();
- }
-
public void saveRuntimePreferences() {
saveRuntimePaths();
RuntimeCoreActivator.getDefault().saveEnabledDetectors();
}
private void initRuntimePaths() throws WorkbenchException {
- runtimePaths = new HashSet<RuntimePath>();
String runtimes = getPreferences().get(RUNTIME_PATHS, null);
if (runtimes == null || runtimes.isEmpty()) {
return;
}
- Reader reader = new StringReader(runtimes);
- XMLMemento memento = XMLMemento.createReadRoot(reader);
- String preferencesVersion = memento.getString(PREFERENCES_VERSION);
- boolean computeIncluded = preferencesVersion == null;
- IMemento[] nodes = memento.getChildren(RUNTIME_PATH);
- for (IMemento node:nodes) {
- String path = node.getString(PATH);
- boolean scanOnEveryStartup = node.getBoolean(SCAN_ON_EVERY_STAERTUP);
- String tsString = node.getString(TIMESTAMP);
- Long timestamp = null;
- try {
- timestamp = new Long(tsString);
- } catch (NumberFormatException e) {
- // ignore
- }
- RuntimePath runtimePath = new RuntimePath(path);
- runtimePath.setScanOnEveryStartup(scanOnEveryStartup);
- if (timestamp != null) {
- runtimePath.setTimestamp(timestamp);
- }
- IMemento serverDefinitionsNode = node.getChild(SERVER_DEFINITIONS);
- IMemento[] sdNodes = serverDefinitionsNode.getChildren(SERVER_DEFINITION);
- for (IMemento sdNode:sdNodes) {
- RuntimeDefinition serverDefinition = createServerDefinition(sdNode);
- serverDefinition.setRuntimePath(runtimePath);
- IMemento includedDefinition = sdNode.getChild(INCLUDED_DEFINITION);
- if (includedDefinition != null) {
- IMemento[] includedNodes = includedDefinition
- .getChildren(SERVER_DEFINITION);
- for (IMemento includedNode : includedNodes) {
- RuntimeDefinition included = createServerDefinition(includedNode);
- included.setRuntimePath(runtimePath);
- included.setParent(serverDefinition);
- serverDefinition.getIncludedRuntimeDefinitions().add(
- included);
- }
- }
- runtimePath.getRuntimeDefinitions().add(serverDefinition);
- }
- runtimePaths.add(runtimePath);
- }
- if (computeIncluded) {
- for(RuntimeDefinition definition:getServerDefinitions()) {
- Set<IRuntimeDetector> detectors = RuntimeCoreActivator.getDefault().getRuntimeDetectors();
- for (IRuntimeDetector detector:detectors) {
- detector.computeIncludedRuntimeDefinition(definition);
- }
- }
- }
+ runtimePaths = RuntimePathPreferenceIO.loadRuntimePathsFromPreferenceString(runtimes);
}
- private RuntimeDefinition createServerDefinition(IMemento node) {
- String name = node.getString(NAME);
- String version = node.getString(VERSION);
- String type = node.getString(TYPE);
- String location = node.getString(LOCATION);
- String description = node.getString(DESCRIPTION);
- boolean enabled = node.getBoolean(ENABLED);
- RuntimeDefinition serverDefinition =
- new RuntimeDefinition(name, version, type, new File(location));
- serverDefinition.setDescription(description);
- serverDefinition.setEnabled(enabled);
- return serverDefinition;
- }
-
private static IEclipsePreferences getPreferences() {
if (prefs == null) {
prefs = ConfigurationScope.INSTANCE.getNode(PLUGIN_ID);
@@ -370,71 +199,29 @@
}
public void saveRuntimePaths() {
- if (runtimePaths == null) {
+ if (runtimePaths == null)
return;
- }
- XMLMemento memento = XMLMemento.createWriteRoot(RUNTIME_PATHS);
- Writer writer = null;
+
try {
- memento.putString(PREFERENCES_VERSION, RUNTIME_PREFERENCES_VERSION);
- for (RuntimePath runtimePath:runtimePaths) {
- IMemento runtimePathNode = memento.createChild(RUNTIME_PATH);
- runtimePathNode.putString(PATH, runtimePath.getPath());
- runtimePathNode.putBoolean(SCAN_ON_EVERY_STAERTUP, runtimePath.isScanOnEveryStartup());
- runtimePathNode.putString(TIMESTAMP, String.valueOf(runtimePath.getTimestamp()));
- IMemento serverDefinitionsNode = runtimePathNode.createChild(SERVER_DEFINITIONS);
- List<RuntimeDefinition> definitions = runtimePath.getRuntimeDefinitions();
- putDefinitions(serverDefinitionsNode, definitions);
- }
- writer = new StringWriter();
- memento.save(writer);
- writer.flush();
- String runtimes = writer.toString();
+ String runtimes = RuntimePathPreferenceIO.getPreferenceOutputString(runtimePaths);
getPreferences().put(RUNTIME_PATHS, runtimes);
getPreferences().flush();
- if (runtimePathChangeChangeListeners != null) {
- Object[] listeners = runtimePathChangeChangeListeners.getListeners();
- for (Object listener:listeners ) {
- IRuntimePathChangeListener runtimePathChangeChangeListener = (IRuntimePathChangeListener) listener;
- runtimePathChangeChangeListener.changed();
- }
- }
+ fireRuntimePathsChanged();
} catch (Exception e) {
log(e);
- } finally {
- if (writer != null) {
- try {
- writer.close();
- } catch (IOException e) {
- // ignore
- }
- }
}
}
- private void putDefinitions(IMemento serverDefintionsNode,
- List<RuntimeDefinition> definitions) {
- for (RuntimeDefinition serverDefinition:definitions) {
- IMemento sdNode = serverDefintionsNode.createChild(SERVER_DEFINITION);
- putServerDefinition(serverDefinition, sdNode);
- IMemento includedNodes = sdNode.createChild(INCLUDED_DEFINITION);
- for (RuntimeDefinition included:serverDefinition.getIncludedRuntimeDefinitions()) {
- IMemento includedNode = includedNodes.createChild(SERVER_DEFINITION);
- putServerDefinition(included, includedNode);
+ private void fireRuntimePathsChanged() {
+ if (runtimePathChangeChangeListeners != null) {
+ Object[] listeners = runtimePathChangeChangeListeners.getListeners();
+ for (Object listener:listeners ) {
+ IRuntimePathChangeListener runtimePathChangeChangeListener = (IRuntimePathChangeListener) listener;
+ runtimePathChangeChangeListener.changed();
}
}
}
- private void putServerDefinition(RuntimeDefinition serverDefinition,
- IMemento node) {
- node.putString(NAME, serverDefinition.getName());
- node.putString(VERSION, serverDefinition.getVersion());
- node.putString(TYPE, serverDefinition.getType());
- node.putString(LOCATION, serverDefinition.getLocation().getAbsolutePath());
- node.putString(DESCRIPTION, serverDefinition.getDescription());
- node.putBoolean(ENABLED, serverDefinition.isEnabled());
- }
-
public Set<RuntimePath> getRuntimePaths() {
if (runtimePaths == null) {
try {
@@ -448,15 +235,15 @@
}
public List<RuntimeDefinition> getServerDefinitions() {
- if (serverDefinitions == null) {
- serverDefinitions = new ArrayList<RuntimeDefinition>();
+ if (runtimeDefinitions == null) {
+ runtimeDefinitions = new ArrayList<RuntimeDefinition>();
} else {
- serverDefinitions.clear();
+ runtimeDefinitions.clear();
}
for (RuntimePath runtimePath:getRuntimePaths()) {
- serverDefinitions.addAll(runtimePath.getRuntimeDefinitions());
+ runtimeDefinitions.addAll(runtimePath.getRuntimeDefinitions());
}
- return serverDefinitions;
+ return runtimeDefinitions;
}
public Set<IRuntimeDetector> getRuntimeDetectors() {
@@ -468,44 +255,15 @@
}
public static void setTimestamp(Set<RuntimePath> runtimePaths2) {
- for (RuntimePath runtimePath : runtimePaths2) {
- String path = runtimePath.getPath();
- if (path != null && !path.isEmpty()) {
- File directory = new File(path);
- if (directory.isDirectory()) {
- runtimePath.setTimestamp(directory.lastModified());
- }
- }
- }
+ RuntimeModelUtil.updateTimestamps(runtimePaths2);
}
public void refreshRuntimePreferences() {
runtimePaths = null;
}
- public static boolean runtimeCreated(RuntimeDefinition serverDefinition) {
- Set<IRuntimeDetector> detectors = getDefault().getRuntimeDetectors();
- boolean created = false;
- for (IRuntimeDetector detector:detectors) {
- if (!detector.isEnabled()) {
- continue;
- }
- if (detector.exists(serverDefinition)) {
- List<RuntimeDefinition> includedDefinitions = serverDefinition.getIncludedRuntimeDefinitions();
- boolean includedCreated = true;
- for (RuntimeDefinition includedDefinition:includedDefinitions) {
- if (!runtimeCreated(includedDefinition)) {
- includedCreated = false;
- break;
- }
- }
- if (includedCreated) {
- created = true;
- break;
- }
- }
- }
- return (created);
+ public static boolean runtimeCreated(RuntimeDefinition runtimeDefinition) {
+ return RuntimeModelUtil.verifyRuntimeDefinitionCreated(runtimeDefinition);
}
public void addRuntimePathChangeListener(IRuntimePathChangeListener listener) {
Added: trunk/runtime/plugins/org.jboss.tools.runtime.ui/src/org/jboss/tools/runtime/ui/RuntimeWorkbenchUtils.java
===================================================================
--- trunk/runtime/plugins/org.jboss.tools.runtime.ui/src/org/jboss/tools/runtime/ui/RuntimeWorkbenchUtils.java (rev 0)
+++ trunk/runtime/plugins/org.jboss.tools.runtime.ui/src/org/jboss/tools/runtime/ui/RuntimeWorkbenchUtils.java 2012-09-07 02:11:25 UTC (rev 43494)
@@ -0,0 +1,51 @@
+package org.jboss.tools.runtime.ui;
+
+import org.eclipse.jface.preference.PreferenceDialog;
+import org.eclipse.swt.widgets.Display;
+import org.eclipse.swt.widgets.Shell;
+import org.eclipse.ui.IViewPart;
+import org.eclipse.ui.PlatformUI;
+import org.eclipse.ui.dialogs.PreferencesUtil;
+import org.eclipse.ui.navigator.CommonNavigator;
+import org.jboss.tools.runtime.ui.preferences.RuntimePreferencePage;
+
+public class RuntimeWorkbenchUtils {
+ public static void refreshServersView() {
+ // https://jira.jboss.org/jira/browse/JBDS-1091
+ Display.getDefault().asyncExec(new Runnable() {
+ public void run() {
+ IViewPart view = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().findView("org.eclipse.wst.server.ui.ServersView");
+ if (view instanceof CommonNavigator) {
+ CommonNavigator navigator = (CommonNavigator) view;
+ navigator.getCommonViewer().refresh();
+ }
+ }
+ });
+ }
+
+ public static void refreshPreferencePage(final Shell shell) {
+ Display.getCurrent().asyncExec(new Runnable() {
+ public void run() {
+ refreshPreferencePageUIThread(shell);
+ }
+ });
+ }
+
+ public static void refreshPreferencePageUIThread(Shell shell) {
+ Shell mainShell = PlatformUI.getWorkbench().getActiveWorkbenchWindow()
+ .getShell();
+ if (shell != null && !shell.isDisposed()) {
+ shell.close();
+ }
+ shell = Display.getCurrent().getActiveShell();
+ if (shell != mainShell && shell != null) {
+ shell.close();
+ }
+ PreferenceDialog preferenceDialog = PreferencesUtil
+ .createPreferenceDialogOn(PlatformUI.getWorkbench()
+ .getActiveWorkbenchWindow().getShell(),
+ RuntimePreferencePage.ID, null, null);
+ preferenceDialog.open();
+ }
+
+}
Modified: trunk/runtime/plugins/org.jboss.tools.runtime.ui/src/org/jboss/tools/runtime/ui/dialogs/SearchRuntimePathDialog.java
===================================================================
--- trunk/runtime/plugins/org.jboss.tools.runtime.ui/src/org/jboss/tools/runtime/ui/dialogs/SearchRuntimePathDialog.java 2012-09-07 01:01:45 UTC (rev 43493)
+++ trunk/runtime/plugins/org.jboss.tools.runtime.ui/src/org/jboss/tools/runtime/ui/dialogs/SearchRuntimePathDialog.java 2012-09-07 02:11:25 UTC (rev 43494)
@@ -43,9 +43,10 @@
import org.eclipse.swt.widgets.TreeItem;
import org.jboss.tools.runtime.core.RuntimeCoreActivator;
import org.jboss.tools.runtime.core.model.IRuntimeDetector;
-import org.jboss.tools.runtime.core.model.RuntimePath;
import org.jboss.tools.runtime.core.model.RuntimeDefinition;
+import org.jboss.tools.runtime.core.model.RuntimePath;
import org.jboss.tools.runtime.ui.RuntimeUIActivator;
+import org.jboss.tools.runtime.ui.RuntimeWorkbenchUtils;
/**
* @author snjeza
@@ -267,13 +268,7 @@
setReturnCode(OK);
close();
if (needRefresh) {
- Display.getCurrent().asyncExec(new Runnable() {
-
- public void run() {
- RuntimeUIActivator.refreshPreferencePage(getShell());
- }
- });
-
+ RuntimeWorkbenchUtils.refreshPreferencePage(getShell());
}
}
@@ -340,13 +335,12 @@
List<RuntimeDefinition> allDefinitions = getAllDefinitions();
for (RuntimePath runtimePath : runtimePaths) {
List<RuntimeDefinition> pathDefinitions = getAllDefinitions(runtimePath);
- for (RuntimeDefinition serverDefinition : pathDefinitions) {
- if (!RuntimeUIActivator.runtimeCreated(serverDefinition)) {
-
- String name = serverDefinition.getName();
+ for (RuntimeDefinition runtimeDefinition : pathDefinitions) {
+ if (!RuntimeUIActivator.runtimeCreated(runtimeDefinition)) {
+ String name = runtimeDefinition.getName();
int i = 2;
- while (serverDefinitionsExists(serverDefinition, allDefinitions)) {
- serverDefinition.setName(name + " (" + i++ + ")");
+ while (runtimeDefinitionsExists(runtimeDefinition, allDefinitions)) {
+ runtimeDefinition.setName(name + " (" + i++ + ")");
}
}
}
@@ -382,7 +376,7 @@
return allServerDefinitions;
}
- private boolean serverDefinitionsExists(RuntimeDefinition serverDefinition,
+ private boolean runtimeDefinitionsExists(RuntimeDefinition serverDefinition,
List<RuntimeDefinition> allServerDefinitions) {
String name = serverDefinition.getName();
File location = serverDefinition.getLocation();
Modified: trunk/runtime/plugins/org.jboss.tools.runtime.ui/src/org/jboss/tools/runtime/ui/preferences/RuntimePreferencePage.java
===================================================================
--- trunk/runtime/plugins/org.jboss.tools.runtime.ui/src/org/jboss/tools/runtime/ui/preferences/RuntimePreferencePage.java 2012-09-07 01:01:45 UTC (rev 43493)
+++ trunk/runtime/plugins/org.jboss.tools.runtime.ui/src/org/jboss/tools/runtime/ui/preferences/RuntimePreferencePage.java 2012-09-07 02:11:25 UTC (rev 43494)
@@ -78,6 +78,7 @@
import org.jboss.tools.runtime.ui.IRuntimePathChangeListener;
import org.jboss.tools.runtime.ui.RuntimeSharedImages;
import org.jboss.tools.runtime.ui.RuntimeUIActivator;
+import org.jboss.tools.runtime.ui.RuntimeWorkbenchUtils;
import org.jboss.tools.runtime.ui.dialogs.AutoResizeTableLayout;
import org.jboss.tools.runtime.ui.dialogs.EditRuntimePathDialog;
import org.jboss.tools.runtime.ui.dialogs.RuntimePathEditingSupport;
@@ -383,7 +384,7 @@
}
}
if (!getControl().isDisposed()) {
- RuntimeUIActivator.refreshPreferencePage(getShell());
+ RuntimeWorkbenchUtils.refreshPreferencePageUIThread(getShell());
}
}
@@ -535,7 +536,7 @@
}
- class RuntimePathLabelProvider extends ColumnLabelProvider {
+ public static class RuntimePathLabelProvider extends ColumnLabelProvider {
private int columnIndex;
@@ -576,7 +577,7 @@
}
}
- private class RuntimeDetectorContentProvider implements IStructuredContentProvider {
+ private static class RuntimeDetectorContentProvider implements IStructuredContentProvider {
private Set<IRuntimeDetector> detectors;
@@ -597,7 +598,7 @@
}
}
- private class RuntimeDetectorLabelProvider extends LabelProvider implements
+ private static class RuntimeDetectorLabelProvider extends LabelProvider implements
ITableLabelProvider {
public Image getColumnImage(Object element, int columnIndex) {
Modified: trunk/runtime/tests/org.jboss.tools.runtime.test/src/org/jboss/tools/runtime/handlers/TestHandler1.java
===================================================================
--- trunk/runtime/tests/org.jboss.tools.runtime.test/src/org/jboss/tools/runtime/handlers/TestHandler1.java 2012-09-07 01:01:45 UTC (rev 43493)
+++ trunk/runtime/tests/org.jboss.tools.runtime.test/src/org/jboss/tools/runtime/handlers/TestHandler1.java 2012-09-07 02:11:25 UTC (rev 43494)
@@ -4,9 +4,12 @@
import java.util.ArrayList;
import java.util.List;
+import org.eclipse.core.runtime.IPath;
import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.core.runtime.Path;
import org.jboss.tools.runtime.core.model.AbstractRuntimeDetectorDelegate;
import org.jboss.tools.runtime.core.model.RuntimeDefinition;
+import org.jboss.tools.runtime.test.RuntimeTestActivator;
public class TestHandler1 extends AbstractRuntimeDetectorDelegate {
@@ -18,6 +21,12 @@
public TestHandler1() {
ME = this;
+ System.out.println("Inside TestHandler constructor: " + this.toString());
+ try {
+ throw new Exception();
+ } catch(Exception e) {
+ e.printStackTrace();
+ }
}
private ArrayList<String> initialized = new ArrayList<String>();
@@ -25,20 +34,26 @@
initialized.clear();
}
private void addInit(String s) {
+ System.out.println("__ Adding s: " + s);
initialized.add(s);
}
public String[] getInited() {
+ System.out.println("__ getting inited: " + initialized);
return (String[]) initialized.toArray(new String[initialized.size()]);
}
@Override
public RuntimeDefinition getRuntimeDefinition(File root,
IProgressMonitor monitor) {
- if( root.isDirectory() && root.list().length == 0 ) {
- RuntimeDefinition def = new RuntimeDefinition(
- "Handler1 Folder " + root.getName(), "1.0",
- "testHandler", root);
- return def;
+ IPath rootPath = new Path(root.getAbsolutePath());
+ IPath stateLoc = RuntimeTestActivator.getDefault().getStateLocation();
+ if( stateLoc.isPrefixOf(rootPath)) {
+ if( root.isDirectory() && root.list().length == 0 ) {
+ RuntimeDefinition def = new RuntimeDefinition(
+ "Handler1 Folder " + root.getName(), "1.0",
+ "testHandler", root);
+ return def;
+ }
}
return null;
}
Modified: trunk/runtime/tests/org.jboss.tools.runtime.test/src/org/jboss/tools/runtime/test/RuntimeDetectionAllTests.java
===================================================================
--- trunk/runtime/tests/org.jboss.tools.runtime.test/src/org/jboss/tools/runtime/test/RuntimeDetectionAllTests.java 2012-09-07 01:01:45 UTC (rev 43493)
+++ trunk/runtime/tests/org.jboss.tools.runtime.test/src/org/jboss/tools/runtime/test/RuntimeDetectionAllTests.java 2012-09-07 02:11:25 UTC (rev 43494)
@@ -15,7 +15,8 @@
@Suite.SuiteClasses({
- RuntimeDetectionFrameworkTest.class
+ RuntimeDetectionFrameworkTest.class,
+ RuntimePathUtilTest.class
})
@RunWith(Suite.class)
Modified: trunk/runtime/tests/org.jboss.tools.runtime.test/src/org/jboss/tools/runtime/test/RuntimeDetectionFrameworkTest.java
===================================================================
--- trunk/runtime/tests/org.jboss.tools.runtime.test/src/org/jboss/tools/runtime/test/RuntimeDetectionFrameworkTest.java 2012-09-07 01:01:45 UTC (rev 43493)
+++ trunk/runtime/tests/org.jboss.tools.runtime.test/src/org/jboss/tools/runtime/test/RuntimeDetectionFrameworkTest.java 2012-09-07 02:11:25 UTC (rev 43494)
@@ -131,11 +131,16 @@
Set<IRuntimeDetector> detectors = RuntimeCoreActivator.getDefault().getRuntimeDetectors();
for( IRuntimeDetector detector:detectors) {
if (detector.isEnabled()) {
+ System.out.println("initializing for detector " + detector.getId());
detector.initializeRuntimes(runtimeDefinitions);
}
}
-
- String[] initialized = TestHandler1.getInstance().getInited();
+ TestHandler1 handler = TestHandler1.getInstance();
+ String[] initialized = handler.getInited();
+ if( initialized.length == 0 ) {
+ // debug
+ System.out.println("HERE inspecting handler " + handler.toString());
+ }
assertEquals(3, initialized.length);
}
Added: trunk/runtime/tests/org.jboss.tools.runtime.test/src/org/jboss/tools/runtime/test/RuntimePathUtilTest.java
===================================================================
--- trunk/runtime/tests/org.jboss.tools.runtime.test/src/org/jboss/tools/runtime/test/RuntimePathUtilTest.java (rev 0)
+++ trunk/runtime/tests/org.jboss.tools.runtime.test/src/org/jboss/tools/runtime/test/RuntimePathUtilTest.java 2012-09-07 02:11:25 UTC (rev 43494)
@@ -0,0 +1,48 @@
+package org.jboss.tools.runtime.test;
+
+import static org.jboss.tools.runtime.core.util.RuntimeModelUtil.IN_LINE_DELIMITER;
+import static org.jboss.tools.runtime.core.util.RuntimeModelUtil.LINE_DELIMITER;
+
+import java.io.ByteArrayInputStream;
+import java.util.Set;
+
+import junit.framework.TestCase;
+
+import org.jboss.tools.runtime.core.model.RuntimePath;
+import org.jboss.tools.runtime.core.util.RuntimeModelUtil;
+import org.junit.Test;
+
+public class RuntimePathUtilTest extends TestCase {
+ @Test
+ public void testSimplePropertyFile() {
+ String twoLine =
+ "name1=/home/some/path" + IN_LINE_DELIMITER
+ + "true" + LINE_DELIMITER
+ + "name2=/home/some/path2" + IN_LINE_DELIMITER
+ + "false" + LINE_DELIMITER;
+ byte[] asBytes = twoLine.getBytes();
+ ByteArrayInputStream is = new ByteArrayInputStream(asBytes);
+ Set<RuntimePath> paths = RuntimeModelUtil.parseRuntimeFile(is, true);
+ assertEquals(2, paths.size());
+
+ is = new ByteArrayInputStream(asBytes);
+ paths = RuntimeModelUtil.parseRuntimeFile(is, false);
+ assertEquals(0, paths.size());
+ }
+
+ @Test
+ public void testDuplicatePathDifferentNameRescan() {
+ String twoLine =
+ "name1=/home/some/path" + IN_LINE_DELIMITER
+ + "true" + LINE_DELIMITER
+ + "name2=/home/some/path" + IN_LINE_DELIMITER
+ + "false" + LINE_DELIMITER;
+ ByteArrayInputStream is = new ByteArrayInputStream(twoLine.getBytes());
+ Set<RuntimePath> paths = RuntimeModelUtil.parseRuntimeFile(is, true);
+ assertEquals(1, paths.size());
+
+ is = new ByteArrayInputStream(twoLine.getBytes());
+ paths = RuntimeModelUtil.parseRuntimeFile(is, false);
+ assertEquals(0, paths.size());
+ }
+}
13 years, 3 months
- 1
- 0
JBoss Tools SVN: r43493 - in trunk: common/tests/org.jboss.tools.common.base.test/src/org/jboss/tools/common/base/test and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: dazarov
Date: 2012-09-06 21:01:45 -0400 (Thu, 06 Sep 2012)
New Revision: 43493
Modified:
trunk/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/ui/test/marker/CDIQuickFixTest.java
trunk/common/tests/org.jboss.tools.common.base.test/src/org/jboss/tools/common/base/test/QuickFixTestUtil.java
Log:
Make CDI Quick Fixes work for As-You-Type validator annotations https://issues.jboss.org/browse/JBIDE-12328
Modified: trunk/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/ui/test/marker/CDIQuickFixTest.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/ui/test/marker/CDIQuickFixTest.java 2012-09-07 00:37:29 UTC (rev 43492)
+++ trunk/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/ui/test/marker/CDIQuickFixTest.java 2012-09-07 01:01:45 UTC (rev 43493)
@@ -1,10 +1,6 @@
package org.jboss.tools.cdi.ui.test.marker;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.IncrementalProjectBuilder;
import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.wst.validation.ValidationFramework;
import org.jboss.tools.cdi.core.test.tck.TCKTest;
import org.jboss.tools.cdi.internal.core.validation.CDIValidationErrorManager;
import org.jboss.tools.cdi.ui.marker.AddAnnotationMarkerResolution;
@@ -40,6 +36,7 @@
util.checkProposal(tckProject,
"JavaSource/org/jboss/jsr299/tck/tests/jbt/quickfixes/MakeFieldStatic.java",
"JavaSource/org/jboss/jsr299/tck/tests/jbt/quickfixes/MakeFieldStatic.qfxresult",
+ "@Produces",
CDIValidationErrorManager.ILLEGAL_PRODUCER_FIELD_IN_SESSION_BEAN_ID,
MakeFieldStaticMarkerResolution.class, true);
}
@@ -48,6 +45,7 @@
util.checkProposal(tckProject,
"JavaSource/org/jboss/jsr299/tck/tests/jbt/quickfixes/AddLocalBean.java",
"JavaSource/org/jboss/jsr299/tck/tests/jbt/quickfixes/AddLocalBean.qfxresult",
+ "@Produces",
CDIValidationErrorManager.ILLEGAL_PRODUCER_METHOD_IN_SESSION_BEAN_ID,
AddLocalBeanMarkerResolution.class, true);
}
@@ -56,6 +54,7 @@
util.checkProposal(tckProject,
"JavaSource/org/jboss/jsr299/tck/tests/jbt/quickfixes/MakeMethodPublic.java",
"JavaSource/org/jboss/jsr299/tck/tests/jbt/quickfixes/MakeMethodPublic.qfxresult",
+ "@Produces",
CDIValidationErrorManager.ILLEGAL_PRODUCER_METHOD_IN_SESSION_BEAN_ID,
MakeMethodPublicMarkerResolution.class, true);
}
@@ -65,6 +64,7 @@
util.checkProposal(tckProject,
"JavaSource/org/jboss/jsr299/tck/tests/jbt/quickfixes/AddSerializable.java",
"JavaSource/org/jboss/jsr299/tck/tests/jbt/quickfixes/AddSerializable.qfxresult",
+ "AddSerializable",
CDIValidationErrorManager.NOT_PASSIVATION_CAPABLE_BEAN_ID,
AddSerializableInterfaceMarkerResolution.class, true);
}
@@ -73,6 +73,7 @@
util.checkProposal(tckProject,
"JavaSource/org/jboss/jsr299/tck/tests/jbt/quickfixes/AddRetention.java",
"JavaSource/org/jboss/jsr299/tck/tests/jbt/quickfixes/AddRetention.qfxresult",
+ "AddRetention",
CDIValidationErrorManager.MISSING_RETENTION_ANNOTATION_IN_QUALIFIER_TYPE_ID,
AddRetentionAnnotationMarkerResolution.class, true);
}
@@ -81,6 +82,7 @@
util.checkProposal(tckProject,
"JavaSource/org/jboss/jsr299/tck/tests/jbt/quickfixes/ChangeAnnotation.java",
"JavaSource/org/jboss/jsr299/tck/tests/jbt/quickfixes/ChangeAnnotation.qfxresult",
+ "@Retention(value = null)",
CDIValidationErrorManager.MISSING_RETENTION_ANNOTATION_IN_QUALIFIER_TYPE_ID,
ChangeAnnotationMarkerResolution.class, true);
}
@@ -89,6 +91,7 @@
util.checkProposal(tckProject,
"JavaSource/org/jboss/jsr299/tck/tests/jbt/quickfixes/AddTarget.java",
"JavaSource/org/jboss/jsr299/tck/tests/jbt/quickfixes/AddTarget.qfxresult",
+ "AddTarget",
CDIValidationErrorManager.MISSING_TARGET_ANNOTATION_IN_SCOPE_TYPE_ID,
AddTargetAnnotationMarkerResolution.class, true);
}
@@ -97,6 +100,7 @@
util.checkProposal(tckProject,
"JavaSource/org/jboss/jsr299/tck/tests/jbt/quickfixes/AddAnnotation.java",
"JavaSource/org/jboss/jsr299/tck/tests/jbt/quickfixes/AddAnnotation.qfxresult",
+ "abc",
CDIValidationErrorManager.MISSING_NONBINDING_FOR_ANNOTATION_VALUE_IN_QUALIFIER_TYPE_MEMBER_ID,
AddAnnotationMarkerResolution.class, true);
}
@@ -105,6 +109,7 @@
util.checkProposal(tckProject,
"JavaSource/org/jboss/jsr299/tck/tests/jbt/quickfixes/DeleteAnnotation.java",
"JavaSource/org/jboss/jsr299/tck/tests/jbt/quickfixes/DeleteAnnotation.qfxresult",
+ "@Inject",
CDIValidationErrorManager.CONSTRUCTOR_PARAMETER_ANNOTATED_DISPOSES_ID,
DeleteAnnotationMarkerResolution.class, true);
}
@@ -113,6 +118,7 @@
util.checkProposal(tckProject,
"WebContent/WEB-INF/beans.xml",
"JavaSource/org/jboss/jsr299/tck/tests/jbt/quickfixes/NonExistingAlternative.qfxresult",
+ "",
CDIValidationErrorManager.UNKNOWN_ALTERNATIVE_BEAN_CLASS_NAME_ID,
CreateCDIElementMarkerResolution.class, false);
}
@@ -121,6 +127,7 @@
util.checkProposal(tckProject,
"WebContent/WEB-INF/beans.xml",
"JavaSource/org/jboss/jsr299/tck/tests/jbt/quickfixes/NonExistingStereotype.qfxresult",
+ "",
CDIValidationErrorManager.UNKNOWN_ALTERNATIVE_ANNOTATION_NAME_ID,
CreateCDIElementMarkerResolution.class, false);
}
@@ -129,6 +136,7 @@
util.checkProposal(tckProject,
"WebContent/WEB-INF/beans.xml",
"JavaSource/org/jboss/jsr299/tck/tests/jbt/quickfixes/NonExistingDecorator.qfxresult",
+ "",
CDIValidationErrorManager.UNKNOWN_DECORATOR_BEAN_CLASS_NAME_ID,
CreateCDIElementMarkerResolution.class, false);
}
@@ -137,6 +145,7 @@
util.checkProposal(tckProject,
"WebContent/WEB-INF/beans.xml",
"JavaSource/org/jboss/jsr299/tck/tests/jbt/quickfixes/NonExistingInterceptor.qfxresult",
+ "",
CDIValidationErrorManager.UNKNOWN_INTERCEPTOR_CLASS_NAME_ID,
CreateCDIElementMarkerResolution.class, false);
}
Modified: trunk/common/tests/org.jboss.tools.common.base.test/src/org/jboss/tools/common/base/test/QuickFixTestUtil.java
===================================================================
--- trunk/common/tests/org.jboss.tools.common.base.test/src/org/jboss/tools/common/base/test/QuickFixTestUtil.java 2012-09-07 00:37:29 UTC (rev 43492)
+++ trunk/common/tests/org.jboss.tools.common.base.test/src/org/jboss/tools/common/base/test/QuickFixTestUtil.java 2012-09-07 01:01:45 UTC (rev 43493)
@@ -1,7 +1,6 @@
package org.jboss.tools.common.base.test;
import java.util.ArrayList;
-import java.util.Iterator;
import java.util.List;
import junit.framework.Assert;
@@ -10,18 +9,18 @@
import org.eclipse.core.resources.IProject;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.NullProgressMonitor;
+import org.eclipse.jdt.core.ICompilationUnit;
+import org.eclipse.jdt.core.JavaModelException;
import org.eclipse.jdt.internal.ui.javaeditor.JavaEditor;
import org.eclipse.jdt.internal.ui.javaeditor.JavaMarkerAnnotation;
import org.eclipse.jdt.ui.text.java.IJavaCompletionProposal;
import org.eclipse.jface.text.IDocument;
import org.eclipse.jface.text.Position;
import org.eclipse.jface.text.source.Annotation;
-import org.eclipse.jface.text.source.IAnnotationModel;
import org.eclipse.jface.text.source.ISourceViewer;
import org.eclipse.ltk.core.refactoring.CompositeChange;
import org.eclipse.ltk.core.refactoring.RefactoringStatus;
import org.eclipse.ltk.core.refactoring.participants.RefactoringProcessor;
-import org.eclipse.swt.widgets.Display;
import org.eclipse.ui.IEditorDescriptor;
import org.eclipse.ui.IEditorInput;
import org.eclipse.ui.IEditorPart;
@@ -30,9 +29,10 @@
import org.eclipse.ui.PlatformUI;
import org.eclipse.ui.editors.text.EditorsUI;
import org.eclipse.ui.part.FileEditorInput;
-import org.eclipse.wst.sse.ui.StructuredTextEditor;
+import org.eclipse.wst.sse.ui.internal.reconcile.ReconcileAnnotationKey;
import org.eclipse.wst.sse.ui.internal.reconcile.TemporaryAnnotation;
-import org.eclipse.wst.xml.ui.internal.tabletree.XMLMultiPageEditorPart;
+import org.eclipse.wst.validation.internal.provisional.core.IMessage;
+import org.jboss.tools.common.EclipseUtil;
import org.jboss.tools.common.editor.ObjectMultiPageEditor;
import org.jboss.tools.common.model.ui.editor.EditorPartWrapper;
import org.jboss.tools.common.quickfix.QuickFixManager;
@@ -41,9 +41,10 @@
import org.jboss.tools.common.ui.marker.AddSuppressWarningsMarkerResolution;
import org.jboss.tools.common.ui.marker.ConfigureProblemSeverityMarkerResolution;
import org.jboss.tools.common.util.FileUtil;
+import org.jboss.tools.common.validation.TempMarkerManager;
+import org.jboss.tools.common.validation.ValidationMessage;
import org.jboss.tools.common.validation.java.TempJavaProblem;
import org.jboss.tools.common.validation.java.TempJavaProblemAnnotation;
-import org.jboss.tools.test.util.JobUtils;
public class QuickFixTestUtil{
private static final int MAX_SECONDS_TO_WAIT = 3;
@@ -100,7 +101,7 @@
}
}
- public void checkProposal(IProject project, String fileName, String newFile, int id, Class<? extends IJavaCompletionProposal> proposalClass, boolean checkResult) throws CoreException {
+ public void checkProposal(IProject project, String fileName, String newFile, String str, int id, Class<? extends IJavaCompletionProposal> proposalClass, boolean checkResult) throws CoreException {
IFile file = project.getFile(fileName);
IFile nFile = project.getFile(newFile);
@@ -122,59 +123,42 @@
document.set(text);
- // Find annotation
- IAnnotationModel annotationModel = viewer.getAnnotationModel();
- Annotation[] annotations = waitForProblemAnnotationAppearance(annotationModel, id);
- //System.out.println("ANNOTATIONS Before...");
- //for(TempJavaProblemAnnotation a : annotations){
- // System.out.println(a.getText());
- //}
+ int offset = text.indexOf(str);
- Assert.assertTrue("No annotations found", annotations.length > 0);
+ Assert.assertTrue("String - "+str+" not found", offset > 0);
- for(Annotation annotation : annotations){
- Position position = annotationModel.getPosition(annotation);
- IJavaCompletionProposal[] proposals = getCompletionProposals(annotation, position);
- checkForConfigureProblemSeverity(proposals);
- checkForAddSuppressWarnings(file, annotation, proposals);
- for(IJavaCompletionProposal proposal : proposals){
- if (proposal.getClass().equals(proposalClass)) {
- if(checkResult){
- if(proposal instanceof TestableResolutionWithRefactoringProcessor){
- RefactoringProcessor processor = ((TestableResolutionWithRefactoringProcessor)proposal).getRefactoringProcessor();
-
- RefactoringStatus status = processor.checkInitialConditions(new NullProgressMonitor());
-
- Assert.assertNull("Rename processor returns fatal error", status.getEntryMatchingSeverity(RefactoringStatus.FATAL));
-
- status = processor.checkFinalConditions(new NullProgressMonitor(), null);
-
- Assert.assertNull("Rename processor returns fatal error", status.getEntryMatchingSeverity(RefactoringStatus.FATAL));
-
- CompositeChange rootChange = (CompositeChange)processor.createChange(new NullProgressMonitor());
-
- rootChange.perform(new NullProgressMonitor());
- } else if(proposal instanceof TestableResolutionWithDialog){
- ((TestableResolutionWithDialog) proposal).runForTest(null);
- } else {
- proposal.apply(document);
- }
-
- //TestUtil.validate(file);
-
- Annotation[] newAnnotations = waitForProblemAnnotationAppearance(annotationModel, id);
- //System.out.println("ANNOTATIONS After...");
- //for(TempJavaProblemAnnotation a : newAnnotations){
- // System.out.println(a.getText());
- //}
+ int length = str.length();
+ Annotation annotation = createAnnotation(file, id, offset, length);
+
+ Position position = new Position(offset, length);
+ IJavaCompletionProposal[] proposals = getCompletionProposals(annotation, position);
+ checkForConfigureProblemSeverity(proposals);
+ checkForAddSuppressWarnings(file, annotation, proposals);
+ for(IJavaCompletionProposal proposal : proposals){
+ if (proposal.getClass().equals(proposalClass)) {
+ if(checkResult){
+ if(proposal instanceof TestableResolutionWithRefactoringProcessor){
+ RefactoringProcessor processor = ((TestableResolutionWithRefactoringProcessor)proposal).getRefactoringProcessor();
+
+ RefactoringStatus status = processor.checkInitialConditions(new NullProgressMonitor());
+
+ Assert.assertNull("Rename processor returns fatal error", status.getEntryMatchingSeverity(RefactoringStatus.FATAL));
-
- Assert.assertTrue("Quick fix did not decrease number of problems. was: "+annotations.length+" now: "+newAnnotations.length, newAnnotations.length <= annotations.length);
-
- checkResults(file, document.get());
+ status = processor.checkFinalConditions(new NullProgressMonitor(), null);
+
+ Assert.assertNull("Rename processor returns fatal error", status.getEntryMatchingSeverity(RefactoringStatus.FATAL));
+
+ CompositeChange rootChange = (CompositeChange)processor.createChange(new NullProgressMonitor());
+
+ rootChange.perform(new NullProgressMonitor());
+ } else if(proposal instanceof TestableResolutionWithDialog){
+ ((TestableResolutionWithDialog) proposal).runForTest(null);
+ } else {
+ proposal.apply(document);
}
- return;
+
}
+ return;
}
}
@@ -204,52 +188,39 @@
Assert.assertEquals("Wrong result of resolution", fileContent, text);
}
- protected Annotation[] waitForProblemAnnotationAppearance(final IAnnotationModel annotationModel, final int problemId) {
- final ArrayList<Annotation> annotations = new ArrayList<Annotation>();
-
- Display.getDefault().syncExec(new Runnable() {
- public void run() {
- int secondsLeft = MAX_SECONDS_TO_WAIT;
- boolean isFirstPass = true;
- boolean found = false;
- while (secondsLeft-- > 0 && !found) {
- if (!isFirstPass) {
- JobUtils.delay(1000);
-
- // clean differed events
- while (Display.getCurrent().readAndDispatch())
- ;
- } else {
- secondsLeft++; // because the wait step was skipped
- }
-
- //boolean found = false;
-
- Iterator it = annotationModel.getAnnotationIterator();
- while (it.hasNext()) {
- Object o = it.next();
-
- if (o instanceof TempJavaProblemAnnotation){
- int id = ((TempJavaProblemAnnotation) o).getId() - TempJavaProblem.TEMP_PROBLEM_ID;
- if(id == problemId){
- annotations.add((TempJavaProblemAnnotation) o);
- found = true;
- }
- }else if(o instanceof TemporaryAnnotation){
- Integer attribute = ((Integer) ((TemporaryAnnotation)o).getAttributes().get("Message_id"));
- int id = attribute.intValue();
- if(id == problemId){
- annotations.add((TemporaryAnnotation) o);
- found = true;
- }
- }
-
- }
- isFirstPass = false;
+ protected Annotation createAnnotation(IFile file, int quickFixId, int offset, int length){
+ if("java".equals(file.getFileExtension())){
+ ICompilationUnit compilationUnit = EclipseUtil.getCompilationUnit(file);
+
+ synchronized(compilationUnit) {
+ try {
+ compilationUnit.reconcile(ICompilationUnit.NO_AST, true, null, null);
+ } catch (JavaModelException e) {
+ Assert.fail(e.getMessage());
}
}
- });
-
- return annotations.toArray(new Annotation[]{});
+ Assert.assertNotNull("Compilation unit not found for file - "+file.getName());
+
+ ValidationMessage message = new ValidationMessage(IMessage.NORMAL_SEVERITY, "Message", compilationUnit.getResource());
+ message.setOffset(offset);
+ message.setLength(length);
+ message.setLineNo(1);
+ message.setBundleName("org.jboss.tools.cdi.internal.core.validation.messages");
+ message.setAttribute(TempMarkerManager.AS_YOU_TYPE_VALIDATION_ANNOTATION_ATTRIBUTE, Boolean.TRUE);
+ message.setAttribute(TempMarkerManager.MESSAGE_ID_ATTRIBUTE_NAME, quickFixId);
+ message.setAttribute(TempMarkerManager.PREFERENCE_KEY_ATTRIBUTE_NAME, "preferenceKey");
+ message.setAttribute(TempMarkerManager.PREFERENCE_PAGE_ID_NAME, "pref_page_id");
+ message.setAttribute(TempMarkerManager.MESSAGE_TYPE_ATTRIBUTE_NAME, JavaMarkerAnnotation.WARNING_ANNOTATION_TYPE);
+
+ TempJavaProblem problem = new TempJavaProblem(message, "origin");
+
+ TempJavaProblemAnnotation annotation = new TempJavaProblemAnnotation(problem, compilationUnit);
+
+ return annotation;
+ }else{
+ TemporaryAnnotation annotation = new TemporaryAnnotation(new Position(offset, length), "type", "message", null, quickFixId);
+
+ return annotation;
+ }
}
}
13 years, 3 months
- 1
- 0
JBoss Tools SVN: r43492 - trunk/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/ui/test/testmodel.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2012-09-06 20:37:29 -0400 (Thu, 06 Sep 2012)
New Revision: 43492
Modified:
trunk/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/ui/test/testmodel/CDIBean.java
trunk/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/ui/test/testmodel/CDIInjectionPoint.java
trunk/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/ui/test/testmodel/CDIQualifier.java
Log:
JBIDE-12446
https://issues.jboss.org/browse/JBIDE-12446
Interface ICDICache added.
Modified: trunk/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/ui/test/testmodel/CDIBean.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/ui/test/testmodel/CDIBean.java 2012-09-07 00:37:04 UTC (rev 43491)
+++ trunk/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/ui/test/testmodel/CDIBean.java 2012-09-07 00:37:29 UTC (rev 43492)
@@ -295,4 +295,10 @@
public IJavaElement getSourceElement() {
return getSourceMember();
}
+
+ @Override
+ public int getId() {
+ // TODO Auto-generated method stub
+ return 0;
+ }
}
\ No newline at end of file
Modified: trunk/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/ui/test/testmodel/CDIInjectionPoint.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/ui/test/testmodel/CDIInjectionPoint.java 2012-09-07 00:37:04 UTC (rev 43491)
+++ trunk/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/ui/test/testmodel/CDIInjectionPoint.java 2012-09-07 00:37:29 UTC (rev 43492)
@@ -160,4 +160,9 @@
public IJavaElement getSourceElement() {
return getSourceMember();
}
+
+ @Override
+ public int getId() {
+ return 0;
+ }
}
\ No newline at end of file
Modified: trunk/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/ui/test/testmodel/CDIQualifier.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/ui/test/testmodel/CDIQualifier.java 2012-09-07 00:37:04 UTC (rev 43491)
+++ trunk/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/ui/test/testmodel/CDIQualifier.java 2012-09-07 00:37:29 UTC (rev 43492)
@@ -105,4 +105,9 @@
public String getElementName() {
return null;
}
+
+ @Override
+ public int getId() {
+ return 0;
+ }
}
\ No newline at end of file
13 years, 3 months
- 1
- 0
JBoss Tools SVN: r43491 - in trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi: internal/core/impl and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2012-09-06 20:37:04 -0400 (Thu, 06 Sep 2012)
New Revision: 43491
Added:
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/ICDICache.java
Modified:
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/ICDIElement.java
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/CDIElement.java
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/CDIProject.java
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/CDIProjectAsYouType.java
Log:
JBIDE-12446
https://issues.jboss.org/browse/JBIDE-12446
Interface ICDICache added.
Added: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/ICDICache.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/ICDICache.java (rev 0)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/ICDICache.java 2012-09-07 00:37:04 UTC (rev 43491)
@@ -0,0 +1,35 @@
+/*******************************************************************************
+ * Copyright (c) 2012 Red Hat, Inc.
+ * Distributed under license by Red Hat, Inc. All rights reserved.
+ * This program is made available under the terms of the
+ * Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
+package org.jboss.tools.cdi.core;
+
+import java.util.Collection;
+
+public interface ICDICache {
+
+ /**
+ * Cleans from database all data related to the project,
+ * and creates tables for beans, legal types, and connections between them.
+ *
+ * @param project
+ * @param bean
+ */
+ public void rebuild(ICDIProject project, Collection<IBean> bean);
+
+ /**
+ * Returns all beans that has 'legalType' as one of legal types.
+ *
+ * @param project
+ * @param legalType
+ * @return
+ */
+ public Collection<IBean> getBeansByLegalType(ICDIProject project, String legalType);
+
+}
Property changes on: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/ICDICache.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/ICDIElement.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/ICDIElement.java 2012-09-07 00:33:48 UTC (rev 43490)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/ICDIElement.java 2012-09-07 00:37:04 UTC (rev 43491)
@@ -21,6 +21,12 @@
public interface ICDIElement {
/**
+ * Returns unique id of this object. It is assigned only for the current session.
+ * @return
+ */
+ int getId();
+
+ /**
* Returns CDI project that contains this object.
* @return
*/
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/CDIElement.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/CDIElement.java 2012-09-07 00:33:48 UTC (rev 43490)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/CDIElement.java 2012-09-07 00:37:04 UTC (rev 43491)
@@ -28,9 +28,21 @@
*
*/
public abstract class CDIElement implements ICDIElement {
+ static int LAST_ID = 0;
+ protected int id;
protected ICDIElement parent;
protected IPath source;
+ public CDIElement() {
+ synchronized (this) {
+ id = LAST_ID++;
+ }
+ }
+
+ public int getId() {
+ return id;
+ }
+
@Override
public ICDIProject getCDIProject() {
return parent != null ? parent.getCDIProject() : null;
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/CDIProject.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/CDIProject.java 2012-09-07 00:33:48 UTC (rev 43490)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/CDIProject.java 2012-09-07 00:37:04 UTC (rev 43491)
@@ -40,6 +40,7 @@
import org.jboss.tools.cdi.core.IBeanMethod;
import org.jboss.tools.cdi.core.IBuiltInBean;
import org.jboss.tools.cdi.core.ICDIAnnotation;
+import org.jboss.tools.cdi.core.ICDICache;
import org.jboss.tools.cdi.core.ICDIProject;
import org.jboss.tools.cdi.core.IClassBean;
import org.jboss.tools.cdi.core.IDecorator;
@@ -85,11 +86,13 @@
private ICDIProject declaringProject = this;
private CDICache cache = new CDICache();
+ private ICDICache dbCache;
BeansXMLData allBeansXMLData = new BeansXMLData();
BeansXMLData projectBeansXMLData = new BeansXMLData();
public CDIProject() {
+ //TODO create dbCache instance
}
public CDIProject getModifiedCopy(IFile file, Collection<IBean> beans) {
@@ -368,6 +371,14 @@
String injectionPointName = injectionPoint.getBeanName();
+ Collection<IBean> beans = null;
+
+ //DB
+ if(dbCache != null) {
+ beans = dbCache.getBeansByLegalType(this, type.getType().getFullyQualifiedName());
+ }
+ //Compare with result from cache.
+
for (IBean b: cache.getBeansByLegalType(type)) {
if(isObjectType || containsType(b.getLegalTypes(), type)) {
try {
@@ -1121,6 +1132,11 @@
bp.buildBeans(this);
}
}
+
+ // DB
+ if(dbCache != null) {
+ dbCache.rebuild(this, cache.getAllBeans());
+ }
Set<IBeanStoreFeature> beanStores = n.getExtensionManager().getFeatures(IBeanStoreFeature.class);
for (IBeanStoreFeature bp: beanStores) {
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/CDIProjectAsYouType.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/CDIProjectAsYouType.java 2012-09-07 00:33:48 UTC (rev 43490)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/CDIProjectAsYouType.java 2012-09-07 00:37:04 UTC (rev 43491)
@@ -607,4 +607,9 @@
return project.isClassAlternativeActivated(fullQualifiedTypeName);
}
+ @Override
+ public int getId() {
+ return ((ICDIElement)project).getId();
+ }
+
}
13 years, 3 months
- 1
- 0
JBoss Tools SVN: r43490 - in trunk/build: parent and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2012-09-06 20:33:48 -0400 (Thu, 06 Sep 2012)
New Revision: 43490
Modified:
trunk/build/aggregate/local-site/compositeArtifacts.xml
trunk/build/aggregate/local-site/compositeContent.xml
trunk/build/parent/pom.xml
Log:
JBDS-2270 Cannot install JBDS 6.0.0.Alpha1 on x86_64 Win
fixed
Modified: trunk/build/aggregate/local-site/compositeArtifacts.xml
===================================================================
--- trunk/build/aggregate/local-site/compositeArtifacts.xml 2012-09-07 00:08:19 UTC (rev 43489)
+++ trunk/build/aggregate/local-site/compositeArtifacts.xml 2012-09-07 00:33:48 UTC (rev 43490)
@@ -7,7 +7,7 @@
get new time w/
date +%s000
-->
-<property name='p2.timestamp' value='1306350337001'/>
+<property name='p2.timestamp' value='1306350337002'/>
</properties>
<children size='31'>
@@ -47,7 +47,7 @@
<child location='../../../xulrunner/site/target/repository/'/>
<child location='../../../openshift/site/target/repository/'/>
-<child location='../../../central/site/target/site/'/>
+<child location='../../../central/site/target/repository/'/>
</children>
</repository>
Modified: trunk/build/aggregate/local-site/compositeContent.xml
===================================================================
--- trunk/build/aggregate/local-site/compositeContent.xml 2012-09-07 00:08:19 UTC (rev 43489)
+++ trunk/build/aggregate/local-site/compositeContent.xml 2012-09-07 00:33:48 UTC (rev 43490)
@@ -7,7 +7,7 @@
get new time w/
date +%s000
-->
-<property name='p2.timestamp' value='1306350337001'/>
+<property name='p2.timestamp' value='1306350337002'/>
</properties>
<children size='31'>
@@ -47,7 +47,7 @@
<child location='../../../xulrunner/site/target/repository/'/>
<child location='../../../openshift/site/target/repository/'/>
-<child location='../../../central/site/target/site/'/>
+<child location='../../../central/site/target/repository/'/>
</children>
</repository>
Modified: trunk/build/parent/pom.xml
===================================================================
--- trunk/build/parent/pom.xml 2012-09-07 00:08:19 UTC (rev 43489)
+++ trunk/build/parent/pom.xml 2012-09-07 00:33:48 UTC (rev 43490)
@@ -152,11 +152,21 @@
<arch>x86</arch>
</environment>
<environment>
+ <os>macosx</os>
+ <ws>cocoa</ws>
+ <arch>x86_64</arch>
+ </environment>
+ <environment>
<os>win32</os>
<ws>win32</ws>
<arch>x86</arch>
</environment>
<environment>
+ <os>win32</os>
+ <ws>win32</ws>
+ <arch>x86_64</arch>
+ </environment>
+ <environment>
<os>linux</os>
<ws>gtk</ws>
<arch>x86</arch>
13 years, 3 months
- 1
- 0
JBoss Tools SVN: r43489 - workspace/akazakov/db/org.jboss.tools.cdi.db/src/org/jboss/tools/cdi/db.
by jbosstools-commits＠lists.jboss.org
Author: akazakov
Date: 2012-09-06 20:08:19 -0400 (Thu, 06 Sep 2012)
New Revision: 43489
Added:
workspace/akazakov/db/org.jboss.tools.cdi.db/src/org/jboss/tools/cdi/db/CDIDataBase.java
Log:
https://issues.jboss.org/browse/JBIDE-12446
Added: workspace/akazakov/db/org.jboss.tools.cdi.db/src/org/jboss/tools/cdi/db/CDIDataBase.java
===================================================================
--- workspace/akazakov/db/org.jboss.tools.cdi.db/src/org/jboss/tools/cdi/db/CDIDataBase.java (rev 0)
+++ workspace/akazakov/db/org.jboss.tools.cdi.db/src/org/jboss/tools/cdi/db/CDIDataBase.java 2012-09-07 00:08:19 UTC (rev 43489)
@@ -0,0 +1,34 @@
+/*******************************************************************************
+ * Copyright (c) 2012 Red Hat, Inc.
+ * Distributed under license by Red Hat, Inc. All rights reserved.
+ * This program is made available under the terms of the
+ * Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
+package org.jboss.tools.cdi.db;
+
+import java.util.Collection;
+
+import org.jboss.tools.cdi.db.entity.BeanEntity;
+
+/**
+ * @author Alexey Kazakov
+ */
+public class CDIDataBase {
+
+ private static final CDIDataBase INSTANCE = new CDIDataBase();
+
+ private CDIDataBase() {
+ }
+
+ public static CDIDataBase getInstance() {
+ return INSTANCE;
+ }
+
+ public Collection<BeanEntity> getBeans() {
+ return null;
+ }
+}
\ No newline at end of file
Property changes on: workspace/akazakov/db/org.jboss.tools.cdi.db/src/org/jboss/tools/cdi/db/CDIDataBase.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
13 years, 3 months
- 1
- 0
JBoss Tools SVN: r43488 - in workspace/akazakov/db: org.jboss.tools.common.db/src/org/jboss/tools/common/db and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: akazakov
Date: 2012-09-06 20:02:04 -0400 (Thu, 06 Sep 2012)
New Revision: 43488
Removed:
workspace/akazakov/db/org.jboss.tools.cdi.db/src/org/jboss/tools/cdi/db/DBCDIProject.java
Modified:
workspace/akazakov/db/org.jboss.tools.common.db/src/org/jboss/tools/common/db/AbstractDBManager.java
Log:
https://issues.jboss.org/browse/JBIDE-12446
Deleted: workspace/akazakov/db/org.jboss.tools.cdi.db/src/org/jboss/tools/cdi/db/DBCDIProject.java
===================================================================
--- workspace/akazakov/db/org.jboss.tools.cdi.db/src/org/jboss/tools/cdi/db/DBCDIProject.java 2012-09-06 23:31:51 UTC (rev 43487)
+++ workspace/akazakov/db/org.jboss.tools.cdi.db/src/org/jboss/tools/cdi/db/DBCDIProject.java 2012-09-07 00:02:04 UTC (rev 43488)
@@ -1,33 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2012 Red Hat, Inc.
- * Distributed under license by Red Hat, Inc. All rights reserved.
- * This program is made available under the terms of the
- * Eclipse Public License v1.0 which accompanies this distribution,
- * and is available at http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Red Hat, Inc. - initial API and implementation
- ******************************************************************************/
-package org.jboss.tools.cdi.db;
-
-import java.util.Collection;
-
-import org.jboss.tools.cdi.core.IBean;
-import org.jboss.tools.cdi.core.IInjectionPoint;
-import org.jboss.tools.cdi.internal.core.impl.CDIProject;
-
-/**
- * @author Alexey Kazakov
- */
-public class DBCDIProject extends CDIProject {
-
- /* (non-Javadoc)
- * @see org.jboss.tools.cdi.internal.core.impl.CDIProject#getBeans(boolean, org.jboss.tools.cdi.core.IInjectionPoint)
- */
- @Override
- public Collection<IBean> getBeans(
- boolean attemptToResolveAmbiguousDependency,
- IInjectionPoint injectionPoint) {
- return super.getBeans(attemptToResolveAmbiguousDependency, injectionPoint);
- }
-}
\ No newline at end of file
Modified: workspace/akazakov/db/org.jboss.tools.common.db/src/org/jboss/tools/common/db/AbstractDBManager.java
===================================================================
--- workspace/akazakov/db/org.jboss.tools.common.db/src/org/jboss/tools/common/db/AbstractDBManager.java 2012-09-06 23:31:51 UTC (rev 43487)
+++ workspace/akazakov/db/org.jboss.tools.common.db/src/org/jboss/tools/common/db/AbstractDBManager.java 2012-09-07 00:02:04 UTC (rev 43488)
@@ -34,6 +34,7 @@
protected String url;
protected EntityManagerFactory emf;
+ protected EntityManager em;
protected abstract String getEntityManagerFactoryName();
@@ -54,7 +55,7 @@
init();
}
- public EntityManager createEntityManager() {
+ public EntityManager getEntityManager() {
try {
start();
} catch (InstantiationException e) {
@@ -66,7 +67,9 @@
} catch (SQLException e) {
CommonDbPlugin.getDefault().logError(e);
}
- EntityManager em = emf.createEntityManager();
+ if(em==null || !em.isOpen()) {
+ em = emf.createEntityManager();
+ }
return em;
}
13 years, 3 months
- 1
- 0
JBoss Tools SVN: r43487 - workspace/akazakov/db/org.jboss.tools.common.db.
by jbosstools-commits＠lists.jboss.org
Author: akazakov
Date: 2012-09-06 19:31:51 -0400 (Thu, 06 Sep 2012)
New Revision: 43487
Modified:
workspace/akazakov/db/org.jboss.tools.common.db/.classpath
Log:
https://issues.jboss.org/browse/JBIDE-12446
Modified: workspace/akazakov/db/org.jboss.tools.common.db/.classpath
===================================================================
--- workspace/akazakov/db/org.jboss.tools.common.db/.classpath 2012-09-06 23:31:40 UTC (rev 43486)
+++ workspace/akazakov/db/org.jboss.tools.common.db/.classpath 2012-09-06 23:31:51 UTC (rev 43487)
@@ -10,7 +10,7 @@
<classpathentry exported="true" kind="lib" path="lib/antlr-2.7.7.jar"/>
<classpathentry exported="true" kind="lib" path="lib/dom4j-1.6.1.jar"/>
<classpathentry exported="true" kind="lib" path="lib/hibernate-commons-annotations-4.0.1.Final.jar"/>
- <classpathentry exported="true" kind="lib" path="lib/hibernate-core-4.1.6.Final.jar"/>
+ <classpathentry exported="true" kind="lib" path="lib/hibernate-core-4.1.6.Final.jar" sourcepath="/home/igels/Downloads/Java/JBoss/Hibernate/hibernate-release-4.1.6.Final/project"/>
<classpathentry exported="true" kind="lib" path="lib/hibernate-entitymanager-4.1.6.Final.jar" sourcepath="/home/igels/Downloads/Java/JBoss/Hibernate/hibernate-release-4.1.6.Final/project"/>
<classpathentry exported="true" kind="lib" path="lib/hibernate-jpa-2.0-api-1.0.1.Final.jar" sourcepath="/home/igels/Downloads/Java/JBoss/Hibernate/geronimo-jpa_2.0_spec-1.1-sources.jar">
<attributes>
13 years, 3 months
- 1
- 0
JBoss Tools SVN: r43486 - workspace/akazakov/db/org.jboss.tools.cdi.db/src/org/jboss/tools/cdi/db/entity.
by jbosstools-commits＠lists.jboss.org
Author: akazakov
Date: 2012-09-06 19:31:40 -0400 (Thu, 06 Sep 2012)
New Revision: 43486
Added:
workspace/akazakov/db/org.jboss.tools.cdi.db/src/org/jboss/tools/cdi/db/entity/QualifierEntity.java
Modified:
workspace/akazakov/db/org.jboss.tools.cdi.db/src/org/jboss/tools/cdi/db/entity/BeanEntity.java
workspace/akazakov/db/org.jboss.tools.cdi.db/src/org/jboss/tools/cdi/db/entity/TypeEntity.java
Log:
https://issues.jboss.org/browse/JBIDE-12446
Modified: workspace/akazakov/db/org.jboss.tools.cdi.db/src/org/jboss/tools/cdi/db/entity/BeanEntity.java
===================================================================
--- workspace/akazakov/db/org.jboss.tools.cdi.db/src/org/jboss/tools/cdi/db/entity/BeanEntity.java 2012-09-06 22:59:09 UTC (rev 43485)
+++ workspace/akazakov/db/org.jboss.tools.cdi.db/src/org/jboss/tools/cdi/db/entity/BeanEntity.java 2012-09-06 23:31:40 UTC (rev 43486)
@@ -16,6 +16,8 @@
import javax.persistence.Entity;
import javax.persistence.GeneratedValue;
import javax.persistence.Id;
+import javax.persistence.JoinColumn;
+import javax.persistence.ManyToMany;
/**
* @author Alexey Kazakov
@@ -24,9 +26,10 @@
public class BeanEntity {
private long id;
- private long index;
+ private int index;
+ private short projectIndex;
private List<TypeEntity> types;
- private List<TypeEntity> qualifiers;
+ private List<QualifierEntity> qualifiers;
/**
* @return the id
@@ -45,18 +48,20 @@
this.id = id;
}
- @Column
- public long getIndex() {
+ @Column(unique=true)
+ public int getIndex() {
return index;
}
- public void setIndex(long index) {
+ public void setIndex(int index) {
this.index = index;
}
/**
* @return the types
*/
+ @ManyToMany
+ @JoinColumn(nullable=true)
public List<TypeEntity> getTypes() {
return types;
}
@@ -71,14 +76,41 @@
/**
* @return the qualifiers
*/
- public List<TypeEntity> getQualifiers() {
+ @ManyToMany
+ @JoinColumn(nullable=true)
+ public List<QualifierEntity> getQualifiers() {
return qualifiers;
}
/**
* @param qualifiers the qualifiers to set
*/
- public void setQualifiers(List<TypeEntity> qualifiers) {
+ public void setQualifiers(List<QualifierEntity> qualifiers) {
this.qualifiers = qualifiers;
}
+
+ /**
+ * @return the projectIndex
+ */
+ @Column(nullable=false)
+ public short getProjectIndex() {
+ return projectIndex;
+ }
+
+ /**
+ * @param projectIndex the projectIndex to set
+ */
+ public void setProjectIndex(short projectIndex) {
+ this.projectIndex = projectIndex;
+ }
+
+ @Override
+ public int hashCode() {
+ return index;
+ }
+
+ @Override
+ public String toString() {
+ return "" + index;
+ }
}
\ No newline at end of file
Added: workspace/akazakov/db/org.jboss.tools.cdi.db/src/org/jboss/tools/cdi/db/entity/QualifierEntity.java
===================================================================
--- workspace/akazakov/db/org.jboss.tools.cdi.db/src/org/jboss/tools/cdi/db/entity/QualifierEntity.java (rev 0)
+++ workspace/akazakov/db/org.jboss.tools.cdi.db/src/org/jboss/tools/cdi/db/entity/QualifierEntity.java 2012-09-06 23:31:40 UTC (rev 43486)
@@ -0,0 +1,76 @@
+/*******************************************************************************
+ * Copyright (c) 2012 Red Hat, Inc.
+ * Distributed under license by Red Hat, Inc. All rights reserved.
+ * This program is made available under the terms of the
+ * Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
+package org.jboss.tools.cdi.db.entity;
+
+import javax.persistence.Column;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+
+/**
+ * @author Alexey Kazakov
+ */
+public class QualifierEntity {
+
+ private long id;
+ private int index;
+ private short projectIndex;
+
+ /**
+ * @return the id
+ */
+ @Id
+ @GeneratedValue
+ @Column
+ public long getId() {
+ return id;
+ }
+
+ /**
+ * @param id the id to set
+ */
+ public void setId(long id) {
+ this.id = id;
+ }
+
+ @Column(unique=true)
+ public int getIndex() {
+ return index;
+ }
+
+ public void setIndex(int index) {
+ this.index = index;
+ }
+
+ /**
+ * @return the projectIndex
+ */
+ @Column(nullable=false)
+ public short getProjectIndex() {
+ return projectIndex;
+ }
+
+ /**
+ * @param projectIndex the projectIndex to set
+ */
+ public void setProjectIndex(short projectIndex) {
+ this.projectIndex = projectIndex;
+ }
+
+ @Override
+ public int hashCode() {
+ return index;
+ }
+
+ @Override
+ public String toString() {
+ return "" + index;
+ }
+}
\ No newline at end of file
Property changes on: workspace/akazakov/db/org.jboss.tools.cdi.db/src/org/jboss/tools/cdi/db/entity/QualifierEntity.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Modified: workspace/akazakov/db/org.jboss.tools.cdi.db/src/org/jboss/tools/cdi/db/entity/TypeEntity.java
===================================================================
--- workspace/akazakov/db/org.jboss.tools.cdi.db/src/org/jboss/tools/cdi/db/entity/TypeEntity.java 2012-09-06 22:59:09 UTC (rev 43485)
+++ workspace/akazakov/db/org.jboss.tools.cdi.db/src/org/jboss/tools/cdi/db/entity/TypeEntity.java 2012-09-06 23:31:40 UTC (rev 43486)
@@ -22,7 +22,8 @@
public class TypeEntity {
private long id;
- private long index;
+ private int index;
+ private short projectIndex;
/**
* @return the id
@@ -41,12 +42,37 @@
this.id = id;
}
- @Column
- public long getIndex() {
+ @Column(unique=true)
+ public int getIndex() {
return index;
}
- public void setIndex(long index) {
+ public void setIndex(int index) {
this.index = index;
}
+
+ /**
+ * @return the projectIndex
+ */
+ @Column(nullable=false)
+ public short getProjectIndex() {
+ return projectIndex;
+ }
+
+ /**
+ * @param projectIndex the projectIndex to set
+ */
+ public void setProjectIndex(short projectIndex) {
+ this.projectIndex = projectIndex;
+ }
+
+ @Override
+ public int hashCode() {
+ return index;
+ }
+
+ @Override
+ public String toString() {
+ return "" + index;
+ }
}
\ No newline at end of file
13 years, 3 months
- 1
- 0