aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDawid Pakuła2014-01-21 14:01:18 (EST)
committerGerrit Code Review @ Eclipse.org2014-01-22 13:58:33 (EST)
commit4560a175f26296a58c0a2c73a92961b362098070 (patch)
tree4db1de0ca9d26dc7b98ce085ff5d88b5f49f8e8a
parent11a7448486c1740329092e204fdf0e46d895e450 (diff)
downloadorg.eclipse.pdt-4560a175f26296a58c0a2c73a92961b362098070.zip
org.eclipse.pdt-4560a175f26296a58c0a2c73a92961b362098070.tar.gz
org.eclipse.pdt-4560a175f26296a58c0a2c73a92961b362098070.tar.bz2
Bug 425663 - Maven problems with fresh .m2 repositoryrefs/changes/96/20896/5
Tycho version bump - support for maven 3.1 JBoss tools version bump - support for tycho 0.19 Replace old maven.eclipse.org url Switch repo from juno to kepler Bug: https://bugs.eclipse.org/bugs/show_bug.cgi?id=425663 Change-Id: I78de5c3e9322f23bca6797bc709ff15b2f2f1c2b Signed-off-by: Dawid Pakuła <zulus@w3des.net>
-rw-r--r--dev/org.eclipse.php-repository/pom.xml2
-rw-r--r--org.eclipse.pdt.releng/pom.xml10
-rw-r--r--plugins/org.eclipse.php.ui/src/org/eclipse/php/internal/ui/outline/PHPOutlineContentProvider.java12
-rw-r--r--tests/org.eclipse.php.ui.tests/src/org/eclipse/php/ui/tests/contentassist/ContentAssistTests.java3
4 files changed, 14 insertions, 13 deletions
diff --git a/dev/org.eclipse.php-repository/pom.xml b/dev/org.eclipse.php-repository/pom.xml
index 8b8836d..72ce23e 100644
--- a/dev/org.eclipse.php-repository/pom.xml
+++ b/dev/org.eclipse.php-repository/pom.xml
@@ -26,7 +26,7 @@
<plugin>
<groupId>org.jboss.tools.tycho-plugins</groupId>
<artifactId>repository-utils</artifactId>
- <version>0.16.0-SNAPSHOT</version>
+ <version>0.19.0-SNAPSHOT</version>
<executions>
<execution>
<id>generate-facade</id>
diff --git a/org.eclipse.pdt.releng/pom.xml b/org.eclipse.pdt.releng/pom.xml
index 1a3759c..2933c1a 100644
--- a/org.eclipse.pdt.releng/pom.xml
+++ b/org.eclipse.pdt.releng/pom.xml
@@ -10,7 +10,7 @@
<!-- this is the parent POM from which all modules inherit common settings -->
<properties>
- <tycho-version>0.14.0</tycho-version>
+ <tycho-version>0.19.0</tycho-version>
<antrun-version>1.6</antrun-version>
<maven.test.failure.ignore>true</maven.test.failure.ignore>
<test.vmargs />
@@ -60,9 +60,9 @@
<url>https://hudson.eclipse.org/hudson/job/dltk-nightly/lastSuccessfulBuild/artifact/org.eclipse.dltk.releng/build/update.site/target/site/</url>
</repository>
<repository>
- <id>juno</id>
+ <id>kepler</id>
<layout>p2</layout>
- <url>http://download.eclipse.org/releases/juno</url>
+ <url>http://download.eclipse.org/releases/kepler</url>
</repository>
<repository>
<id>eclipse-tests</id>
@@ -74,7 +74,7 @@
<pluginRepositories>
<pluginRepository>
<id>maven.eclipse.org</id>
- <url>http://maven.eclipse.org/nexus/content/groups/public/</url>
+ <url>https://repo.eclipse.org/content/repositories/releases/</url>
</pluginRepository>
<pluginRepository>
<id>jboss-public-repository-group</id>
@@ -112,4 +112,4 @@
<module>../tests/org.eclipse.php.formatter.core.tests</module>
</modules>
-</project> \ No newline at end of file
+</project>
diff --git a/plugins/org.eclipse.php.ui/src/org/eclipse/php/internal/ui/outline/PHPOutlineContentProvider.java b/plugins/org.eclipse.php.ui/src/org/eclipse/php/internal/ui/outline/PHPOutlineContentProvider.java
index fea7387..863572f 100644
--- a/plugins/org.eclipse.php.ui/src/org/eclipse/php/internal/ui/outline/PHPOutlineContentProvider.java
+++ b/plugins/org.eclipse.php.ui/src/org/eclipse/php/internal/ui/outline/PHPOutlineContentProvider.java
@@ -4,7 +4,7 @@
* are 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:
* IBM Corporation - initial API and implementation
* Zend Technologies
@@ -235,13 +235,15 @@ public class PHPOutlineContentProvider implements ITreeContentProvider {
if ((delta != null || e.getType() == ElementChangedEvent.POST_CHANGE)
&& fOutlineViewer != null
&& fOutlineViewer.getControl() != null
- && !fOutlineViewer.getControl()
- .isDisposed()) {
+ && !fOutlineViewer.getControl().isDisposed()) {
Display d = control.getDisplay();
if (d != null) {
d.asyncExec(new Runnable() {
public void run() {
- fOutlineViewer.refresh();
+ if (fOutlineViewer.getTree() == null
+ || (fOutlineViewer.getTree() != null && !fOutlineViewer
+ .getTree().isDisposed()))
+ fOutlineViewer.refresh();
}
});
}
@@ -312,7 +314,7 @@ public class PHPOutlineContentProvider implements ITreeContentProvider {
public UseStatementsNode(ISourceModule sourceModule) {
super((ModelElement) sourceModule,
PHPUIMessages.PHPOutlineContentProvider_useStatementsNode,
- 0, null);
+ 0, null);
fSourceModule = sourceModule;
}
diff --git a/tests/org.eclipse.php.ui.tests/src/org/eclipse/php/ui/tests/contentassist/ContentAssistTests.java b/tests/org.eclipse.php.ui.tests/src/org/eclipse/php/ui/tests/contentassist/ContentAssistTests.java
index 27e5661..992a068 100644
--- a/tests/org.eclipse.php.ui.tests/src/org/eclipse/php/ui/tests/contentassist/ContentAssistTests.java
+++ b/tests/org.eclipse.php.ui.tests/src/org/eclipse/php/ui/tests/contentassist/ContentAssistTests.java
@@ -182,8 +182,7 @@ public class ContentAssistTests extends AbstractPDTTTest {
protected static void closeEditor() {
fEditor.doSave(null);
- fEditor.close(false);
- fEditor.dispose();
+ fEditor.getSite().getPage().closeEditor(fEditor, false);
fEditor = null;
if (testFile.exists()) {
try {