Merge branch 'ptp_9_1'
Change-Id: I0a9fe14a1dbc3dd45e1276eebc1f55c35b738e7b
Signed-off-by: Greg Watson <g.watson@computer.org>
diff --git a/org.eclipse.photran-feature/feature.xml b/org.eclipse.photran-feature/feature.xml
index 9f67502..9b03df0 100644
--- a/org.eclipse.photran-feature/feature.xml
+++ b/org.eclipse.photran-feature/feature.xml
@@ -2,7 +2,7 @@
<feature
id="org.eclipse.photran"
label="%featureName"
- version="9.1.4.qualifier"
+ version="9.2.0.qualifier"
provider-name="%providerName"
plugin="org.eclipse.photran.core"
license-feature="org.eclipse.license"
diff --git a/org.eclipse.photran.intel-feature/feature.xml b/org.eclipse.photran.intel-feature/feature.xml
index 0d4b415..a0a0ebe 100644
--- a/org.eclipse.photran.intel-feature/feature.xml
+++ b/org.eclipse.photran.intel-feature/feature.xml
@@ -2,7 +2,7 @@
<feature
id="org.eclipse.photran.intel"
label="%featureName"
- version="9.1.4.qualifier"
+ version="9.2.0.qualifier"
provider-name="%providerName"
plugin="org.eclipse.photran.core.intel"
license-feature="org.eclipse.license"
diff --git a/org.eclipse.photran.repo/pom.xml b/org.eclipse.photran.repo/pom.xml
index 7f3f55f..8cb19f8 100644
--- a/org.eclipse.photran.repo/pom.xml
+++ b/org.eclipse.photran.repo/pom.xml
@@ -7,11 +7,11 @@
<parent>
<groupId>org.eclipse.photran</groupId>
<artifactId>photran-parent</artifactId>
- <version>9.1.3-SNAPSHOT</version>
+ <version>9.2.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
- <version>9.1.3-SNAPSHOT</version>
+ <version>9.2.0-SNAPSHOT</version>
<artifactId>org.eclipse.photran.repo</artifactId>
<packaging>eclipse-repository</packaging>
diff --git a/org.eclipse.photran.target/neon.target b/org.eclipse.photran.target/neon.target
index 714ec00..50a57ea 100644
--- a/org.eclipse.photran.target/neon.target
+++ b/org.eclipse.photran.target/neon.target
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<?pde version="3.8"?><target name="mars" sequenceNumber="17">
+<?pde version="3.8"?><target name="photran-neon" sequenceNumber="17">
<locations>
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
<unit id="org.eclipse.launchbar.feature.group" version="0.0.0"/>
@@ -19,7 +19,11 @@
</location>
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
<unit id="org.eclipse.cdt.sdk.feature.group" version="0.0.0"/>
-<repository location="http://download.eclipse.org/tools/cdt/builds/neon/milestones/"/>
+<repository location="http://download.eclipse.org/tools/cdt/builds/neon/milestones/rc4"/>
+</location>
+<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
+<unit id="org.eclipse.tm.terminal.control" version="0.0.0"/>
+<repository location="http://download.eclipse.org/tm/terminal/updates/4.2milestones/"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
<unit id="org.eclipse.tm.terminal.control" version="0.0.0"/>
diff --git a/org.eclipse.photran.target/pom.xml b/org.eclipse.photran.target/pom.xml
index 2e351d4..25f1eb3 100644
--- a/org.eclipse.photran.target/pom.xml
+++ b/org.eclipse.photran.target/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>org.eclipse.photran</groupId>
<artifactId>photran-parent</artifactId>
- <version>9.1.3-SNAPSHOT</version>
+ <version>9.2.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
@@ -32,7 +32,7 @@
<artifact>
<file>oxygen.target</file>
<type>target</type>
- <classifier>oxygen</classifier>
+ <classifier>photran-oxygen</classifier>
</artifact>
</artifacts>
</configuration>
diff --git a/org.eclipse.photran.ui.vpg.preprocessor.c/pom.xml b/org.eclipse.photran.ui.vpg.preprocessor.c/pom.xml
index c0e65e0..1484df2 100644
--- a/org.eclipse.photran.ui.vpg.preprocessor.c/pom.xml
+++ b/org.eclipse.photran.ui.vpg.preprocessor.c/pom.xml
@@ -6,7 +6,7 @@
<parent>
<groupId>org.eclipse.photran</groupId>
<artifactId>photran-parent</artifactId>
- <version>9.1.3-SNAPSHOT</version>
+ <version>9.2.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/org.eclipse.photran.ui/src/org/eclipse/photran/internal/ui/preferences/AbstractFortranPreferencePage.java b/org.eclipse.photran.ui/src/org/eclipse/photran/internal/ui/preferences/AbstractFortranPreferencePage.java
index 2a794c4..8e49d28 100644
--- a/org.eclipse.photran.ui/src/org/eclipse/photran/internal/ui/preferences/AbstractFortranPreferencePage.java
+++ b/org.eclipse.photran.ui/src/org/eclipse/photran/internal/ui/preferences/AbstractFortranPreferencePage.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
+ * Copyright (c) 2000, 2017 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -82,7 +82,7 @@
}
/** Listeners on the adapter */
- private ListenerList<IPropertyChangeListener> fListeners= new ListenerList<>();
+ private ListenerList<IPropertyChangeListener> fListeners= new ListenerList<IPropertyChangeListener>();
/** Listener on the adapted Preferences */
private PropertyChangeListener fListener= new PropertyChangeListener();
@@ -139,9 +139,8 @@
public void firePropertyChangeEvent(String name, Object oldValue, Object newValue) {
if (!fSilent) {
PropertyChangeEvent event= new PropertyChangeEvent(this, name, oldValue, newValue);
- Object[] listeners= fListeners.getListeners();
- for (int i= 0; i < listeners.length; i++)
- ((IPropertyChangeListener) listeners[i]).propertyChange(event);
+ for (IPropertyChangeListener listener : fListeners)
+ listener.propertyChange(event);
}
}
diff --git a/org.eclipse.photran.xlf-feature/feature.xml b/org.eclipse.photran.xlf-feature/feature.xml
index 2bc0462..d7ecf4e 100644
--- a/org.eclipse.photran.xlf-feature/feature.xml
+++ b/org.eclipse.photran.xlf-feature/feature.xml
@@ -2,7 +2,7 @@
<feature
id="org.eclipse.photran.xlf"
label="%featureName"
- version="9.1.4.qualifier"
+ version="9.2.0.qualifier"
provider-name="%providerName"
plugin="org.eclipse.photran.core.xlf"
license-feature="org.eclipse.license"
diff --git a/pom.xml b/pom.xml
index 9b7ad13..e7f4e11 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,14 +10,14 @@
<groupId>org.eclipse.photran</groupId>
<artifactId>photran-parent</artifactId>
- <version>9.1.3-SNAPSHOT</version>
+ <version>9.2.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>PTP Photran Parent</name>
<properties>
<tycho-version>1.0.0</tycho-version>
<tycho-extras-version>${tycho-version}</tycho-extras-version>
- <photran-install-dir>/home/data/httpd/download.eclipse.org/tools/ptp/builds/hudson/ptp-release-photran</photran-install-dir>
+ <photran-install-dir>/home/data/httpd/download.eclipse.org/tools/ptp/builds/hudson/ptp-nightly-photran</photran-install-dir>
</properties>
<licenses>
@@ -103,7 +103,7 @@
<artifact>
<groupId>org.eclipse.photran</groupId>
<artifactId>org.eclipse.photran.target</artifactId>
- <version>9.1.3-SNAPSHOT</version>
+ <version>9.2.0-SNAPSHOT</version>
<classifier>oxygen</classifier>
</artifact>
</target>
