566139 fixes for latest Eclipse fix invalid char / typo / bad encoding Signed-off-by: nickboldt <nboldt@redhat.com> 566139 switch from org.eclipse.jface.util.Assert to org.eclipse.core.runtime.Assert Signed-off-by: nickboldt <nboldt@redhat.com> bump plugins and containing features Signed-off-by: nickboldt <nboldt@redhat.com> bump to update site version 1.14.200-SNAPSHOT Signed-off-by: nickboldt <nboldt@redhat.com> use newer tycho 1.5 and emf 2.22 Signed-off-by: nickboldt <nboldt@redhat.com> 566139 switch from org.eclipse.jface.text.Asset to org.eclipse.core.runtime.Assert Signed-off-by: nickboldt <nboldt@redhat.com> 566139 replace Platform.getJobManager with Job.getJobManager in org.eclipse.datatools.sqltools.sqleditor/src/org/eclipse/datatools/sqltools/sqleditor/plan/GroupPlanSupportRunnable.java Signed-off-by: nickboldt <nboldt@redhat.com> 566139 replace org.eclipse.ui.internal.misc.StringMatcher with java.util.regex.Pattern in plugins/enablement/org.eclipse.datatools.enablement.sybase.asa.schemaobjecteditor.examples/src/org/eclipse/datatools/enablement/sybase/asa/schemaobjecteditor/examples/utils/FilterUtil.java Signed-off-by: nickboldt <nboldt@redhat.com> bump plugin version Signed-off-by: nickboldt <nboldt@redhat.com> bump feature version Signed-off-by: nickboldt <nboldt@redhat.com>
diff --git a/features/org.eclipse.datatools.enablement.sybase.feature/feature.xml b/features/org.eclipse.datatools.enablement.sybase.feature/feature.xml index 65bf2b3..cfc7aa3 100644 --- a/features/org.eclipse.datatools.enablement.sybase.feature/feature.xml +++ b/features/org.eclipse.datatools.enablement.sybase.feature/feature.xml
@@ -2,7 +2,7 @@ <feature id="org.eclipse.datatools.enablement.sybase.feature" label="%featureName" - version="1.14.102.qualifier" + version="1.14.200.qualifier" provider-name="%providerName" plugin="org.eclipse.datatools.enablement.sybase" image="eclipse_update_120.jpg">
diff --git a/features/org.eclipse.datatools.enablement.sybase.feature/pom.xml b/features/org.eclipse.datatools.enablement.sybase.feature/pom.xml index 751ed20..1d18553 100644 --- a/features/org.eclipse.datatools.enablement.sybase.feature/pom.xml +++ b/features/org.eclipse.datatools.enablement.sybase.feature/pom.xml
@@ -9,5 +9,6 @@ </parent> <groupId>org.eclipse.datatools.features</groupId> <artifactId>org.eclipse.datatools.enablement.sybase.feature</artifactId> + <version>1.14.200-SNAPSHOT</version> <packaging>eclipse-feature</packaging> </project>
diff --git a/features/org.eclipse.datatools.sqldevtools.data.feature/feature.xml b/features/org.eclipse.datatools.sqldevtools.data.feature/feature.xml index ca20182..cdadb0c 100644 --- a/features/org.eclipse.datatools.sqldevtools.data.feature/feature.xml +++ b/features/org.eclipse.datatools.sqldevtools.data.feature/feature.xml
@@ -2,7 +2,7 @@ <feature id="org.eclipse.datatools.sqldevtools.data.feature" label="%featureName" - version="1.14.102.qualifier" + version="1.14.200.qualifier" provider-name="%providerName" image="eclipse_update_120.jpg">
diff --git a/features/org.eclipse.datatools.sqldevtools.data.feature/pom.xml b/features/org.eclipse.datatools.sqldevtools.data.feature/pom.xml index 37a3ad7..4351cb1 100644 --- a/features/org.eclipse.datatools.sqldevtools.data.feature/pom.xml +++ b/features/org.eclipse.datatools.sqldevtools.data.feature/pom.xml
@@ -9,5 +9,6 @@ </parent> <groupId>org.eclipse.datatools.features</groupId> <artifactId>org.eclipse.datatools.sqldevtools.data.feature</artifactId> + <version>1.14.200-SNAPSHOT</version> <packaging>eclipse-feature</packaging> </project>
diff --git a/features/org.eclipse.datatools.sqldevtools.ddlgen.feature/feature.xml b/features/org.eclipse.datatools.sqldevtools.ddlgen.feature/feature.xml index 49858d4..0c32195 100644 --- a/features/org.eclipse.datatools.sqldevtools.ddlgen.feature/feature.xml +++ b/features/org.eclipse.datatools.sqldevtools.ddlgen.feature/feature.xml
@@ -2,7 +2,7 @@ <feature id="org.eclipse.datatools.sqldevtools.ddlgen.feature" label="%featureName" - version="1.14.102.qualifier" + version="1.14.200.qualifier" provider-name="%providerName" plugin="org.eclipse.datatools.sqltools.ddlgen.ui" image="eclipse_update_120.jpg">
diff --git a/features/org.eclipse.datatools.sqldevtools.ddlgen.feature/pom.xml b/features/org.eclipse.datatools.sqldevtools.ddlgen.feature/pom.xml index bb91539..a86831a 100644 --- a/features/org.eclipse.datatools.sqldevtools.ddlgen.feature/pom.xml +++ b/features/org.eclipse.datatools.sqldevtools.ddlgen.feature/pom.xml
@@ -9,5 +9,6 @@ </parent> <groupId>org.eclipse.datatools.features</groupId> <artifactId>org.eclipse.datatools.sqldevtools.ddlgen.feature</artifactId> + <version>1.14.200-SNAPSHOT</version> <packaging>eclipse-feature</packaging> </project>
diff --git a/features/org.eclipse.datatools.sqldevtools.feature/feature.xml b/features/org.eclipse.datatools.sqldevtools.feature/feature.xml index 84fb348..6dec4d2 100644 --- a/features/org.eclipse.datatools.sqldevtools.feature/feature.xml +++ b/features/org.eclipse.datatools.sqldevtools.feature/feature.xml
@@ -2,7 +2,7 @@ <feature id="org.eclipse.datatools.sqldevtools.feature" label="%featureName" - version="1.14.102.qualifier" + version="1.14.200.qualifier" provider-name="%providerName" plugin="org.eclipse.datatools.sqltools.common.ui" image="eclipse_update_120.jpg">
diff --git a/features/org.eclipse.datatools.sqldevtools.feature/pom.xml b/features/org.eclipse.datatools.sqldevtools.feature/pom.xml index ef24882..b201d4d 100644 --- a/features/org.eclipse.datatools.sqldevtools.feature/pom.xml +++ b/features/org.eclipse.datatools.sqldevtools.feature/pom.xml
@@ -9,5 +9,6 @@ </parent> <groupId>org.eclipse.datatools.features</groupId> <artifactId>org.eclipse.datatools.sqldevtools.feature</artifactId> + <version>1.14.200-SNAPSHOT</version> <packaging>eclipse-feature</packaging> </project>
diff --git a/features/org.eclipse.datatools.sqldevtools.results.feature/feature.xml b/features/org.eclipse.datatools.sqldevtools.results.feature/feature.xml index 62df86b..893feac 100644 --- a/features/org.eclipse.datatools.sqldevtools.results.feature/feature.xml +++ b/features/org.eclipse.datatools.sqldevtools.results.feature/feature.xml
@@ -2,7 +2,7 @@ <feature id="org.eclipse.datatools.sqldevtools.results.feature" label="%featureName" - version="1.14.102.qualifier" + version="1.14.200.qualifier" provider-name="%providerName" image="eclipse_update_120.jpg">
diff --git a/features/org.eclipse.datatools.sqldevtools.results.feature/pom.xml b/features/org.eclipse.datatools.sqldevtools.results.feature/pom.xml index 8ec2415..f97fcf7 100644 --- a/features/org.eclipse.datatools.sqldevtools.results.feature/pom.xml +++ b/features/org.eclipse.datatools.sqldevtools.results.feature/pom.xml
@@ -9,5 +9,6 @@ </parent> <groupId>org.eclipse.datatools.features</groupId> <artifactId>org.eclipse.datatools.sqldevtools.results.feature</artifactId> + <version>1.14.200-SNAPSHOT</version> <packaging>eclipse-feature</packaging> </project>
diff --git a/features/org.eclipse.datatools.sqldevtools.sqlbuilder.feature/feature.xml b/features/org.eclipse.datatools.sqldevtools.sqlbuilder.feature/feature.xml index f426797..c634369 100644 --- a/features/org.eclipse.datatools.sqldevtools.sqlbuilder.feature/feature.xml +++ b/features/org.eclipse.datatools.sqldevtools.sqlbuilder.feature/feature.xml
@@ -2,7 +2,7 @@ <feature id="org.eclipse.datatools.sqldevtools.sqlbuilder.feature" label="%featureName" - version="1.14.102.qualifier" + version="1.14.200.qualifier" provider-name="%providerName" image="eclipse_update_120.jpg">
diff --git a/features/org.eclipse.datatools.sqldevtools.sqlbuilder.feature/pom.xml b/features/org.eclipse.datatools.sqldevtools.sqlbuilder.feature/pom.xml index f31e82c..c4a76ca 100644 --- a/features/org.eclipse.datatools.sqldevtools.sqlbuilder.feature/pom.xml +++ b/features/org.eclipse.datatools.sqldevtools.sqlbuilder.feature/pom.xml
@@ -9,5 +9,6 @@ </parent> <groupId>org.eclipse.datatools.features</groupId> <artifactId>org.eclipse.datatools.sqldevtools.sqlbuilder.feature</artifactId> + <version>1.14.200-SNAPSHOT</version> <packaging>eclipse-feature</packaging> </project>
diff --git a/plugins/enablement/org.eclipse.datatools.enablement.sybase.asa.schemaobjecteditor.examples/META-INF/MANIFEST.MF b/plugins/enablement/org.eclipse.datatools.enablement.sybase.asa.schemaobjecteditor.examples/META-INF/MANIFEST.MF index e9f5fe2..9ef0156 100644 --- a/plugins/enablement/org.eclipse.datatools.enablement.sybase.asa.schemaobjecteditor.examples/META-INF/MANIFEST.MF +++ b/plugins/enablement/org.eclipse.datatools.enablement.sybase.asa.schemaobjecteditor.examples/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %plugin.name Bundle-SymbolicName: org.eclipse.datatools.enablement.sybase.asa.schemaobjecteditor.examples;singleton:=true -Bundle-Version: 2.7.101.qualifier +Bundle-Version: 2.7.200.qualifier Bundle-Activator: org.eclipse.datatools.enablement.sybase.asa.schemaobjecteditor.examples.ExamplePlugin Bundle-Vendor: %providerName Bundle-Localization: plugin
diff --git a/plugins/enablement/org.eclipse.datatools.enablement.sybase.asa.schemaobjecteditor.examples/pom.xml b/plugins/enablement/org.eclipse.datatools.enablement.sybase.asa.schemaobjecteditor.examples/pom.xml index b2f717a..c81ae03 100644 --- a/plugins/enablement/org.eclipse.datatools.enablement.sybase.asa.schemaobjecteditor.examples/pom.xml +++ b/plugins/enablement/org.eclipse.datatools.enablement.sybase.asa.schemaobjecteditor.examples/pom.xml
@@ -9,6 +9,6 @@ </parent> <groupId>org.eclipse.datatools.plugins</groupId> <artifactId>org.eclipse.datatools.enablement.sybase.asa.schemaobjecteditor.examples</artifactId> - <version>2.7.101-SNAPSHOT</version> + <version>2.7.200-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> </project>
diff --git a/plugins/enablement/org.eclipse.datatools.enablement.sybase.asa.schemaobjecteditor.examples/src/org/eclipse/datatools/enablement/sybase/asa/schemaobjecteditor/examples/utils/FilterUtil.java b/plugins/enablement/org.eclipse.datatools.enablement.sybase.asa.schemaobjecteditor.examples/src/org/eclipse/datatools/enablement/sybase/asa/schemaobjecteditor/examples/utils/FilterUtil.java index 385834b..d1e19c4 100644 --- a/plugins/enablement/org.eclipse.datatools.enablement.sybase.asa.schemaobjecteditor.examples/src/org/eclipse/datatools/enablement/sybase/asa/schemaobjecteditor/examples/utils/FilterUtil.java +++ b/plugins/enablement/org.eclipse.datatools.enablement.sybase.asa.schemaobjecteditor.examples/src/org/eclipse/datatools/enablement/sybase/asa/schemaobjecteditor/examples/utils/FilterUtil.java
@@ -7,7 +7,8 @@ **********************************************************************************************************************/ package org.eclipse.datatools.enablement.sybase.asa.schemaobjecteditor.examples.utils; -import org.eclipse.ui.internal.misc.StringMatcher; +import java.util.regex.Pattern; +import java.util.regex.Matcher; /** * Util Class for Filter @@ -32,13 +33,13 @@ * If invoking the StringMatcher with string literals in Java, don't forget * escape characters are represented by "\\". * - * @param pattern the pattern to match text against + * @param patternString the pattern to match text against * @param value the value to be matched * @return */ - public static boolean isMatch(String pattern, String value) + public static boolean isMatch(String patternString, String value) { - return isMatch(pattern, value, true, false); + return isMatch(patternString, value, true, false); } /** @@ -57,29 +58,44 @@ * If invoking the StringMatcher with string literals in Java, don't forget * escape characters are represented by "\\". * - * @param pattern the pattern to match text against + * @param patternString the pattern to match text against * @param value the value to be matched * @param ignoreCase if true, case is ignored * @param ignoreWildCards if true, wild cards and their escape sequences are ignored * (everything is taken literally). * @return */ - public static boolean isMatch(String pattern, String value, boolean ignoreCase, boolean ignoreWildCards) + public static boolean isMatch(String patternString, String value, boolean ignoreCase, boolean ignoreWildCards) { - if (pattern == null || "".equals(pattern)) //$NON-NLS-1$ + if (patternString == null || "".equals(patternString)) //$NON-NLS-1$ { return true; } - StringMatcher matcher = new StringMatcher(pattern, ignoreCase, ignoreWildCards); - if (matcher.match(value)) + Pattern pattern = getPattern(patternString, ignoreCase, ignoreWildCards); + if (pattern.matcher(value).matches()) { return true; } - StringMatcher matcherWithStart = new StringMatcher(pattern + "*", ignoreCase, ignoreWildCards);//$NON-NLS-1$ - if (matcherWithStart.match(value)) + pattern = getPattern(patternString + "*", ignoreCase, ignoreWildCards); //$NON-NLS-1$ + if (pattern.matcher(value).matches()) { return true; } return false; } + + private static Pattern getPattern(String patternString, boolean ignoreCase, boolean ignoreWildCards) + { + Pattern pattern; + if (ignoreWildCards && ignoreCase) { + pattern = Pattern.compile(patternString, Pattern.LITERAL | Pattern.CASE_INSENSITIVE); + } else if (ignoreWildCards) { + pattern = Pattern.compile(patternString, Pattern.LITERAL); + } else if (ignoreCase) { + pattern = Pattern.compile(patternString, Pattern.CASE_INSENSITIVE); + } else { + pattern = Pattern.compile(patternString); + } + return pattern; + } }
diff --git a/plugins/sqltools/org.eclipse.datatools.sqltools.common.ui/META-INF/MANIFEST.MF b/plugins/sqltools/org.eclipse.datatools.sqltools.common.ui/META-INF/MANIFEST.MF index bfa58eb..eef43dc 100644 --- a/plugins/sqltools/org.eclipse.datatools.sqltools.common.ui/META-INF/MANIFEST.MF +++ b/plugins/sqltools/org.eclipse.datatools.sqltools.common.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Plugin.Name Bundle-SymbolicName: org.eclipse.datatools.sqltools.common.ui;singleton:=true -Bundle-Version: 1.2.101.qualifier +Bundle-Version: 1.2.200.qualifier Bundle-Activator: org.eclipse.datatools.sqltools.common.ui.internal.Activator Bundle-Vendor: %Plugin.ProviderName Bundle-Localization: plugin
diff --git a/plugins/sqltools/org.eclipse.datatools.sqltools.common.ui/pom.xml b/plugins/sqltools/org.eclipse.datatools.sqltools.common.ui/pom.xml index 8aa90d9..b0a57b4 100644 --- a/plugins/sqltools/org.eclipse.datatools.sqltools.common.ui/pom.xml +++ b/plugins/sqltools/org.eclipse.datatools.sqltools.common.ui/pom.xml
@@ -9,6 +9,6 @@ </parent> <groupId>org.eclipse.datatools.plugins</groupId> <artifactId>org.eclipse.datatools.sqltools.common.ui</artifactId> - <version>1.2.101-SNAPSHOT</version> + <version>1.2.200-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> </project>
diff --git a/plugins/sqltools/org.eclipse.datatools.sqltools.common.ui/src/org/eclipse/datatools/sqltools/common/ui/preferences/ComboFieldEditor.java b/plugins/sqltools/org.eclipse.datatools.sqltools.common.ui/src/org/eclipse/datatools/sqltools/common/ui/preferences/ComboFieldEditor.java index ee5f456..64bd5d8 100644 --- a/plugins/sqltools/org.eclipse.datatools.sqltools.common.ui/src/org/eclipse/datatools/sqltools/common/ui/preferences/ComboFieldEditor.java +++ b/plugins/sqltools/org.eclipse.datatools.sqltools.common.ui/src/org/eclipse/datatools/sqltools/common/ui/preferences/ComboFieldEditor.java
@@ -6,7 +6,7 @@ package org.eclipse.datatools.sqltools.common.ui.preferences; import org.eclipse.jface.preference.FieldEditor; -import org.eclipse.jface.util.Assert; +import org.eclipse.core.runtime.Assert; import org.eclipse.swt.SWT; import org.eclipse.swt.events.SelectionAdapter; import org.eclipse.swt.events.SelectionEvent;
diff --git a/plugins/sqltools/org.eclipse.datatools.sqltools.common.ui/src/org/eclipse/datatools/sqltools/common/ui/tableviewer/AccessibleTableViewer.java b/plugins/sqltools/org.eclipse.datatools.sqltools.common.ui/src/org/eclipse/datatools/sqltools/common/ui/tableviewer/AccessibleTableViewer.java index 81e2d08..9615ddd 100644 --- a/plugins/sqltools/org.eclipse.datatools.sqltools.common.ui/src/org/eclipse/datatools/sqltools/common/ui/tableviewer/AccessibleTableViewer.java +++ b/plugins/sqltools/org.eclipse.datatools.sqltools.common.ui/src/org/eclipse/datatools/sqltools/common/ui/tableviewer/AccessibleTableViewer.java
@@ -22,7 +22,7 @@ import org.eclipse.jface.dialogs.ErrorDialog; import org.eclipse.jface.dialogs.IDialogConstants; import org.eclipse.jface.dialogs.MessageDialog; -import org.eclipse.jface.util.Assert; +import org.eclipse.core.runtime.Assert; import org.eclipse.jface.viewers.CellEditor; import org.eclipse.jface.viewers.DoubleClickEvent; import org.eclipse.jface.viewers.IBaseLabelProvider;
diff --git a/plugins/sqltools/org.eclipse.datatools.sqltools.common.ui/src/org/eclipse/datatools/sqltools/common/ui/util/TableLayoutComposite.java b/plugins/sqltools/org.eclipse.datatools.sqltools.common.ui/src/org/eclipse/datatools/sqltools/common/ui/util/TableLayoutComposite.java index 551257e..e850a18 100644 --- a/plugins/sqltools/org.eclipse.datatools.sqltools.common.ui/src/org/eclipse/datatools/sqltools/common/ui/util/TableLayoutComposite.java +++ b/plugins/sqltools/org.eclipse.datatools.sqltools.common.ui/src/org/eclipse/datatools/sqltools/common/ui/util/TableLayoutComposite.java
@@ -8,7 +8,7 @@ import java.util.ArrayList; import java.util.List; -import org.eclipse.jface.util.Assert; +import org.eclipse.core.runtime.Assert; import org.eclipse.jface.viewers.ColumnLayoutData; import org.eclipse.jface.viewers.ColumnPixelData; import org.eclipse.jface.viewers.ColumnWeightData;
diff --git a/plugins/sqltools/org.eclipse.datatools.sqltools.editor.core/src/org/eclipse/datatools/sqltools/core/IControlConnection.java b/plugins/sqltools/org.eclipse.datatools.sqltools.editor.core/src/org/eclipse/datatools/sqltools/core/IControlConnection.java index c67f1a3..0319620 100644 --- a/plugins/sqltools/org.eclipse.datatools.sqltools.editor.core/src/org/eclipse/datatools/sqltools/core/IControlConnection.java +++ b/plugins/sqltools/org.eclipse.datatools.sqltools.editor.core/src/org/eclipse/datatools/sqltools/core/IControlConnection.java
@@ -35,8 +35,8 @@ * <p> * As you can see, all the above mentioned functions can be accomplished by using SQL Model, Database Model and the API * from Connectivity layer. This is because SQL Dev Tools evolves at the same time with DTP Model Base project and - * Connectivity project, so you can view this interface as the ��adapter�� between SQL Dev Tools and the other 2 projects - * of DTP. In fact, we��ll provide a default implementation of this interface which uses SQL Model, Database Model and + * Connectivity project, so you can view this interface as the 'adapter' between SQL Dev Tools and the other 2 projects + * of DTP. In fact, we'll provide a default implementation of this interface which uses SQL Model, Database Model and * the API from Connectivity layer. * </p> *
diff --git a/plugins/sqltools/org.eclipse.datatools.sqltools.routineeditor.ui/src/org/eclipse/datatools/sqltools/routineeditor/ui/RoutineEditor.java b/plugins/sqltools/org.eclipse.datatools.sqltools.routineeditor.ui/src/org/eclipse/datatools/sqltools/routineeditor/ui/RoutineEditor.java index aa80a5f..73bad02 100644 --- a/plugins/sqltools/org.eclipse.datatools.sqltools.routineeditor.ui/src/org/eclipse/datatools/sqltools/routineeditor/ui/RoutineEditor.java +++ b/plugins/sqltools/org.eclipse.datatools.sqltools.routineeditor.ui/src/org/eclipse/datatools/sqltools/routineeditor/ui/RoutineEditor.java
@@ -201,7 +201,7 @@ // 2006-07-20 // Fix 380668-1 Users are confused by 'Execute' and 'Run' context menu // in the editor. - // Keep Execute All, but will only be enabled when you��re editing a SQL + // Keep Execute All, but will only be enabled when you're editing a SQL // file. Disabled at all other times. menu.remove(ISQLEditorActionConstants.EXECUTE_SQL_ACTION_ID); SQLDevToolsUIConfiguration config = SQLToolsUIFacade
diff --git a/plugins/sqltools/org.eclipse.datatools.sqltools.sqlbuilder/META-INF/MANIFEST.MF b/plugins/sqltools/org.eclipse.datatools.sqltools.sqlbuilder/META-INF/MANIFEST.MF index 7a5feac..81e5198 100644 --- a/plugins/sqltools/org.eclipse.datatools.sqltools.sqlbuilder/META-INF/MANIFEST.MF +++ b/plugins/sqltools/org.eclipse.datatools.sqltools.sqlbuilder/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Bundle-Name: %_UI_PLUGIN_NAME Bundle-SymbolicName: org.eclipse.datatools.sqltools.sqlbuilder; singleton:=true Bundle-ClassPath: . -Bundle-Version: 1.2.202.qualifier +Bundle-Version: 1.2.300.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-Activator: org.eclipse.datatools.sqltools.sqlbuilder.SQLBuilderPlugin Bundle-Vendor: %_UI_PLUGIN_PROVIDER
diff --git a/plugins/sqltools/org.eclipse.datatools.sqltools.sqlbuilder/pom.xml b/plugins/sqltools/org.eclipse.datatools.sqltools.sqlbuilder/pom.xml index 6b16d2d..df69e8d 100644 --- a/plugins/sqltools/org.eclipse.datatools.sqltools.sqlbuilder/pom.xml +++ b/plugins/sqltools/org.eclipse.datatools.sqltools.sqlbuilder/pom.xml
@@ -9,6 +9,6 @@ </parent> <groupId>org.eclipse.datatools.plugins</groupId> <artifactId>org.eclipse.datatools.sqltools.sqlbuilder</artifactId> - <version>1.2.202-SNAPSHOT</version> + <version>1.2.300-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> </project>
diff --git a/plugins/sqltools/org.eclipse.datatools.sqltools.sqlbuilder/src/org/eclipse/datatools/sqltools/sqlbuilder/actions/SQLBuilderActionBarContributor.java b/plugins/sqltools/org.eclipse.datatools.sqltools.sqlbuilder/src/org/eclipse/datatools/sqltools/sqlbuilder/actions/SQLBuilderActionBarContributor.java index 3c38ae2..9181f45 100644 --- a/plugins/sqltools/org.eclipse.datatools.sqltools.sqlbuilder/src/org/eclipse/datatools/sqltools/sqlbuilder/actions/SQLBuilderActionBarContributor.java +++ b/plugins/sqltools/org.eclipse.datatools.sqltools.sqlbuilder/src/org/eclipse/datatools/sqltools/sqlbuilder/actions/SQLBuilderActionBarContributor.java
@@ -27,7 +27,7 @@ import org.eclipse.jface.action.MenuManager; import org.eclipse.jface.action.Separator; import org.eclipse.jface.resource.ImageDescriptor; -import org.eclipse.jface.text.Assert; +import org.eclipse.core.runtime.Assert; import org.eclipse.swt.widgets.Display; import org.eclipse.ui.IActionBars; import org.eclipse.ui.IEditorPart;
diff --git a/plugins/sqltools/org.eclipse.datatools.sqltools.sqlbuilder/src/org/eclipse/datatools/sqltools/sqlbuilder/expressionbuilder/caseexpr/CaseSearchTable.java b/plugins/sqltools/org.eclipse.datatools.sqltools.sqlbuilder/src/org/eclipse/datatools/sqltools/sqlbuilder/expressionbuilder/caseexpr/CaseSearchTable.java index d5a1a46..af852a2 100644 --- a/plugins/sqltools/org.eclipse.datatools.sqltools.sqlbuilder/src/org/eclipse/datatools/sqltools/sqlbuilder/expressionbuilder/caseexpr/CaseSearchTable.java +++ b/plugins/sqltools/org.eclipse.datatools.sqltools.sqlbuilder/src/org/eclipse/datatools/sqltools/sqlbuilder/expressionbuilder/caseexpr/CaseSearchTable.java
@@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright © 2000, 2007 IBM Corporation and others. + * Copyright (c) 2000, 2007 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 * which is available at @@ -38,7 +38,7 @@ import org.eclipse.jface.action.IMenuManager; import org.eclipse.jface.action.MenuManager; import org.eclipse.jface.action.Separator; -import org.eclipse.jface.util.Assert; +import org.eclipse.core.runtime.Assert; import org.eclipse.jface.viewers.CellEditor; import org.eclipse.jface.viewers.ColumnPixelData; import org.eclipse.jface.viewers.ICellModifier;
diff --git a/plugins/sqltools/org.eclipse.datatools.sqltools.sqlbuilder/src/org/eclipse/datatools/sqltools/sqlbuilder/expressionbuilder/caseexpr/CaseSimpleTable.java b/plugins/sqltools/org.eclipse.datatools.sqltools.sqlbuilder/src/org/eclipse/datatools/sqltools/sqlbuilder/expressionbuilder/caseexpr/CaseSimpleTable.java index d7c8f49..475150e 100644 --- a/plugins/sqltools/org.eclipse.datatools.sqltools.sqlbuilder/src/org/eclipse/datatools/sqltools/sqlbuilder/expressionbuilder/caseexpr/CaseSimpleTable.java +++ b/plugins/sqltools/org.eclipse.datatools.sqltools.sqlbuilder/src/org/eclipse/datatools/sqltools/sqlbuilder/expressionbuilder/caseexpr/CaseSimpleTable.java
@@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright © 2000, 2007 IBM Corporation and others. + * Copyright (c) 2000, 2007 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 * which is available at @@ -35,7 +35,7 @@ import org.eclipse.jface.action.IMenuManager; import org.eclipse.jface.action.MenuManager; import org.eclipse.jface.action.Separator; -import org.eclipse.jface.util.Assert; +import org.eclipse.core.runtime.Assert; import org.eclipse.jface.viewers.CellEditor; import org.eclipse.jface.viewers.ColumnPixelData; import org.eclipse.jface.viewers.ICellModifier;
diff --git a/plugins/sqltools/org.eclipse.datatools.sqltools.sqlbuilder/src/org/eclipse/datatools/sqltools/sqlbuilder/expressionbuilder/function/ParamTable.java b/plugins/sqltools/org.eclipse.datatools.sqltools.sqlbuilder/src/org/eclipse/datatools/sqltools/sqlbuilder/expressionbuilder/function/ParamTable.java index 782890f..b8ec0fe 100644 --- a/plugins/sqltools/org.eclipse.datatools.sqltools.sqlbuilder/src/org/eclipse/datatools/sqltools/sqlbuilder/expressionbuilder/function/ParamTable.java +++ b/plugins/sqltools/org.eclipse.datatools.sqltools.sqlbuilder/src/org/eclipse/datatools/sqltools/sqlbuilder/expressionbuilder/function/ParamTable.java
@@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright © 2000, 2007 IBM Corporation and others. + * Copyright (c) 2000, 2007 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 * which is available at @@ -37,7 +37,7 @@ import org.eclipse.jface.action.IMenuManager; import org.eclipse.jface.action.MenuManager; import org.eclipse.jface.action.Separator; -import org.eclipse.jface.util.Assert; +import org.eclipse.core.runtime.Assert; import org.eclipse.jface.viewers.CellEditor; import org.eclipse.jface.viewers.ColumnPixelData; import org.eclipse.jface.viewers.ICellModifier;
diff --git a/plugins/sqltools/org.eclipse.datatools.sqltools.sqlbuilder/src/org/eclipse/datatools/sqltools/sqlbuilder/expressionbuilder/multiexpr/ExpressionsTable.java b/plugins/sqltools/org.eclipse.datatools.sqltools.sqlbuilder/src/org/eclipse/datatools/sqltools/sqlbuilder/expressionbuilder/multiexpr/ExpressionsTable.java index bde82f1..17bdfac 100644 --- a/plugins/sqltools/org.eclipse.datatools.sqltools.sqlbuilder/src/org/eclipse/datatools/sqltools/sqlbuilder/expressionbuilder/multiexpr/ExpressionsTable.java +++ b/plugins/sqltools/org.eclipse.datatools.sqltools.sqlbuilder/src/org/eclipse/datatools/sqltools/sqlbuilder/expressionbuilder/multiexpr/ExpressionsTable.java
@@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright © 2000, 2007 IBM Corporation and others. + * Copyright (c) 2000, 2007 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 * which is available at @@ -35,7 +35,7 @@ import org.eclipse.jface.action.IMenuManager; import org.eclipse.jface.action.MenuManager; import org.eclipse.jface.action.Separator; -import org.eclipse.jface.util.Assert; +import org.eclipse.core.runtime.Assert; import org.eclipse.jface.viewers.CellEditor; import org.eclipse.jface.viewers.ColumnPixelData; import org.eclipse.jface.viewers.ICellModifier;
diff --git a/plugins/sqltools/org.eclipse.datatools.sqltools.sqlbuilder/src/org/eclipse/datatools/sqltools/sqlbuilder/util/LabelValuePair.java b/plugins/sqltools/org.eclipse.datatools.sqltools.sqlbuilder/src/org/eclipse/datatools/sqltools/sqlbuilder/util/LabelValuePair.java index 2c8225a..1e34e67 100644 --- a/plugins/sqltools/org.eclipse.datatools.sqltools.sqlbuilder/src/org/eclipse/datatools/sqltools/sqlbuilder/util/LabelValuePair.java +++ b/plugins/sqltools/org.eclipse.datatools.sqltools.sqlbuilder/src/org/eclipse/datatools/sqltools/sqlbuilder/util/LabelValuePair.java
@@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright © 2000, 2007 IBM Corporation and others. + * Copyright (c) 2000, 2007 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 * which is available at @@ -10,7 +10,7 @@ *******************************************************************************/ package org.eclipse.datatools.sqltools.sqlbuilder.util; -import org.eclipse.jface.util.Assert; +import org.eclipse.core.runtime.Assert; public class LabelValuePair {
diff --git a/plugins/sqltools/org.eclipse.datatools.sqltools.sqlbuilder/src/org/eclipse/datatools/sqltools/sqlbuilder/views/source/SQLCompletionProposal.java b/plugins/sqltools/org.eclipse.datatools.sqltools.sqlbuilder/src/org/eclipse/datatools/sqltools/sqlbuilder/views/source/SQLCompletionProposal.java index fe70cd5..c1991ce 100644 --- a/plugins/sqltools/org.eclipse.datatools.sqltools.sqlbuilder/src/org/eclipse/datatools/sqltools/sqlbuilder/views/source/SQLCompletionProposal.java +++ b/plugins/sqltools/org.eclipse.datatools.sqltools.sqlbuilder/src/org/eclipse/datatools/sqltools/sqlbuilder/views/source/SQLCompletionProposal.java
@@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright © 2000, 2007 IBM Corporation and others. + * Copyright (c) 2000, 2007 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 * which is available at @@ -15,7 +15,7 @@ import org.eclipse.jface.text.contentassist.ICompletionProposal; import org.eclipse.jface.text.contentassist.ICompletionProposalExtension; import org.eclipse.jface.text.contentassist.IContextInformation; -import org.eclipse.jface.util.Assert; +import org.eclipse.core.runtime.Assert; import org.eclipse.swt.graphics.Image; import org.eclipse.swt.graphics.Point;
diff --git a/plugins/sqltools/org.eclipse.datatools.sqltools.sqlbuilder/src/org/eclipse/datatools/sqltools/sqlbuilder/views/source/SQLSourceViewer.java b/plugins/sqltools/org.eclipse.datatools.sqltools.sqlbuilder/src/org/eclipse/datatools/sqltools/sqlbuilder/views/source/SQLSourceViewer.java index 6f1c0c2..e314f9f 100644 --- a/plugins/sqltools/org.eclipse.datatools.sqltools.sqlbuilder/src/org/eclipse/datatools/sqltools/sqlbuilder/views/source/SQLSourceViewer.java +++ b/plugins/sqltools/org.eclipse.datatools.sqltools.sqlbuilder/src/org/eclipse/datatools/sqltools/sqlbuilder/views/source/SQLSourceViewer.java
@@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright © 2000, 2009 IBM Corporation and others. + * Copyright (c) 2000, 2009 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 * which is available at @@ -49,7 +49,7 @@ import org.eclipse.jface.text.source.ISourceViewer; import org.eclipse.jface.text.source.SourceViewer; import org.eclipse.jface.text.source.VerticalRuler; -import org.eclipse.jface.util.Assert; +import org.eclipse.core.runtime.Assert; import org.eclipse.jface.util.IPropertyChangeListener; import org.eclipse.jface.util.PropertyChangeEvent; import org.eclipse.jface.viewers.ContentViewer;
diff --git a/plugins/sqltools/org.eclipse.datatools.sqltools.sqleditor/META-INF/MANIFEST.MF b/plugins/sqltools/org.eclipse.datatools.sqltools.sqleditor/META-INF/MANIFEST.MF index f2f4606..f73d612 100644 --- a/plugins/sqltools/org.eclipse.datatools.sqltools.sqleditor/META-INF/MANIFEST.MF +++ b/plugins/sqltools/org.eclipse.datatools.sqltools.sqleditor/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.datatools.sqltools.sqleditor; singleton:=true -Bundle-Version: 1.2.101.qualifier +Bundle-Version: 1.2.200.qualifier Bundle-Activator: org.eclipse.datatools.sqltools.sqleditor.internal.SQLEditorPlugin Bundle-Vendor: %providerName Bundle-Localization: plugin
diff --git a/plugins/sqltools/org.eclipse.datatools.sqltools.sqleditor/pom.xml b/plugins/sqltools/org.eclipse.datatools.sqltools.sqleditor/pom.xml index 473273d..864b0b9 100644 --- a/plugins/sqltools/org.eclipse.datatools.sqltools.sqleditor/pom.xml +++ b/plugins/sqltools/org.eclipse.datatools.sqltools.sqleditor/pom.xml
@@ -9,6 +9,6 @@ </parent> <groupId>org.eclipse.datatools.plugins</groupId> <artifactId>org.eclipse.datatools.sqltools.sqleditor</artifactId> - <version>1.2.101-SNAPSHOT</version> + <version>1.2.200-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> </project>
diff --git a/plugins/sqltools/org.eclipse.datatools.sqltools.sqleditor/src/org/eclipse/datatools/sqltools/sqleditor/internal/actions/SelectionDispatchAction.java b/plugins/sqltools/org.eclipse.datatools.sqltools.sqleditor/src/org/eclipse/datatools/sqltools/sqleditor/internal/actions/SelectionDispatchAction.java index 24ea6a3..32d77c7 100644 --- a/plugins/sqltools/org.eclipse.datatools.sqltools.sqleditor/src/org/eclipse/datatools/sqltools/sqleditor/internal/actions/SelectionDispatchAction.java +++ b/plugins/sqltools/org.eclipse.datatools.sqltools.sqleditor/src/org/eclipse/datatools/sqltools/sqleditor/internal/actions/SelectionDispatchAction.java
@@ -13,7 +13,7 @@ import org.eclipse.jface.action.Action; import org.eclipse.jface.text.ITextSelection; -import org.eclipse.jface.util.Assert; +import org.eclipse.core.runtime.Assert; import org.eclipse.jface.viewers.ISelection; import org.eclipse.jface.viewers.ISelectionChangedListener; import org.eclipse.jface.viewers.ISelectionProvider;
diff --git a/plugins/sqltools/org.eclipse.datatools.sqltools.sqleditor/src/org/eclipse/datatools/sqltools/sqleditor/internal/editor/SQLImageDescriptor.java b/plugins/sqltools/org.eclipse.datatools.sqltools.sqleditor/src/org/eclipse/datatools/sqltools/sqleditor/internal/editor/SQLImageDescriptor.java index 398e489..6c32bd8 100644 --- a/plugins/sqltools/org.eclipse.datatools.sqltools.sqleditor/src/org/eclipse/datatools/sqltools/sqleditor/internal/editor/SQLImageDescriptor.java +++ b/plugins/sqltools/org.eclipse.datatools.sqltools.sqleditor/src/org/eclipse/datatools/sqltools/sqleditor/internal/editor/SQLImageDescriptor.java
@@ -15,7 +15,7 @@ import org.eclipse.datatools.sqltools.sqleditor.internal.SQLEditorResources; import org.eclipse.jface.resource.CompositeImageDescriptor; import org.eclipse.jface.resource.ImageDescriptor; -import org.eclipse.jface.util.Assert; +import org.eclipse.core.runtime.Assert; import org.eclipse.swt.graphics.ImageData; import org.eclipse.swt.graphics.Point;
diff --git a/plugins/sqltools/org.eclipse.datatools.sqltools.sqleditor/src/org/eclipse/datatools/sqltools/sqleditor/internal/indent/SQLHeuristicScanner.java b/plugins/sqltools/org.eclipse.datatools.sqltools.sqleditor/src/org/eclipse/datatools/sqltools/sqleditor/internal/indent/SQLHeuristicScanner.java index 5cafc54..43d2733 100644 --- a/plugins/sqltools/org.eclipse.datatools.sqltools.sqleditor/src/org/eclipse/datatools/sqltools/sqleditor/internal/indent/SQLHeuristicScanner.java +++ b/plugins/sqltools/org.eclipse.datatools.sqltools.sqleditor/src/org/eclipse/datatools/sqltools/sqleditor/internal/indent/SQLHeuristicScanner.java
@@ -8,7 +8,7 @@ import java.util.Arrays; import org.eclipse.datatools.sqltools.sqleditor.internal.sql.SQLPartitionScanner; -import org.eclipse.jface.text.Assert; +import org.eclipse.core.runtime.Assert; import org.eclipse.jface.text.BadLocationException; import org.eclipse.jface.text.IDocument; import org.eclipse.jface.text.ITypedRegion;
diff --git a/plugins/sqltools/org.eclipse.datatools.sqltools.sqleditor/src/org/eclipse/datatools/sqltools/sqleditor/internal/indent/SQLIndenter.java b/plugins/sqltools/org.eclipse.datatools.sqltools.sqleditor/src/org/eclipse/datatools/sqltools/sqleditor/internal/indent/SQLIndenter.java index ed82ad3..6548fa5 100644 --- a/plugins/sqltools/org.eclipse.datatools.sqltools.sqleditor/src/org/eclipse/datatools/sqltools/sqleditor/internal/indent/SQLIndenter.java +++ b/plugins/sqltools/org.eclipse.datatools.sqltools.sqleditor/src/org/eclipse/datatools/sqltools/sqleditor/internal/indent/SQLIndenter.java
@@ -6,7 +6,7 @@ package org.eclipse.datatools.sqltools.sqleditor.internal.indent; import org.eclipse.datatools.sqltools.sqleditor.internal.SQLEditorPlugin; -import org.eclipse.jface.text.Assert; +import org.eclipse.core.runtime.Assert; import org.eclipse.jface.text.BadLocationException; import org.eclipse.jface.text.IDocument; import org.eclipse.jface.text.IRegion;
diff --git a/plugins/sqltools/org.eclipse.datatools.sqltools.sqleditor/src/org/eclipse/datatools/sqltools/sqleditor/internal/sql/SQLValidator.java b/plugins/sqltools/org.eclipse.datatools.sqltools.sqleditor/src/org/eclipse/datatools/sqltools/sqleditor/internal/sql/SQLValidator.java index bd2ed72..ba62a7a 100644 --- a/plugins/sqltools/org.eclipse.datatools.sqltools.sqleditor/src/org/eclipse/datatools/sqltools/sqleditor/internal/sql/SQLValidator.java +++ b/plugins/sqltools/org.eclipse.datatools.sqltools.sqleditor/src/org/eclipse/datatools/sqltools/sqleditor/internal/sql/SQLValidator.java
@@ -16,7 +16,7 @@ import org.eclipse.datatools.sqltools.editor.template.TemplateConstant; import org.eclipse.datatools.sqltools.sqleditor.internal.SQLEditorPlugin; import org.eclipse.jface.preference.IPreferenceStore; -import org.eclipse.jface.text.Assert; +import org.eclipse.core.runtime.Assert; import org.eclipse.jface.text.BadLocationException; import org.eclipse.jface.text.IDocument; import org.eclipse.jface.text.IRegion;
diff --git a/plugins/sqltools/org.eclipse.datatools.sqltools.sqleditor/src/org/eclipse/datatools/sqltools/sqleditor/internal/templates/PositionBasedCompletionProposal.java b/plugins/sqltools/org.eclipse.datatools.sqltools.sqleditor/src/org/eclipse/datatools/sqltools/sqleditor/internal/templates/PositionBasedCompletionProposal.java index 88f3a9b..7521889 100644 --- a/plugins/sqltools/org.eclipse.datatools.sqltools.sqleditor/src/org/eclipse/datatools/sqltools/sqleditor/internal/templates/PositionBasedCompletionProposal.java +++ b/plugins/sqltools/org.eclipse.datatools.sqltools.sqleditor/src/org/eclipse/datatools/sqltools/sqleditor/internal/templates/PositionBasedCompletionProposal.java
@@ -11,7 +11,7 @@ package org.eclipse.datatools.sqltools.sqleditor.internal.templates; -import org.eclipse.jface.text.Assert; +import org.eclipse.core.runtime.Assert; import org.eclipse.jface.text.BadLocationException; import org.eclipse.jface.text.DocumentEvent; import org.eclipse.jface.text.IDocument;
diff --git a/plugins/sqltools/org.eclipse.datatools.sqltools.sqleditor/src/org/eclipse/datatools/sqltools/sqleditor/internal/templates/SQLTemplateProposal.java b/plugins/sqltools/org.eclipse.datatools.sqltools.sqleditor/src/org/eclipse/datatools/sqltools/sqleditor/internal/templates/SQLTemplateProposal.java index 5ad405b..579c06d 100644 --- a/plugins/sqltools/org.eclipse.datatools.sqltools.sqleditor/src/org/eclipse/datatools/sqltools/sqleditor/internal/templates/SQLTemplateProposal.java +++ b/plugins/sqltools/org.eclipse.datatools.sqltools.sqleditor/src/org/eclipse/datatools/sqltools/sqleditor/internal/templates/SQLTemplateProposal.java
@@ -18,7 +18,7 @@ import org.eclipse.datatools.sqltools.sqleditor.internal.sql.ISQLCompletionProposal; import org.eclipse.jface.dialogs.MessageDialog; import org.eclipse.jface.preference.IPreferenceStore; -import org.eclipse.jface.text.Assert; +import org.eclipse.core.runtime.Assert; import org.eclipse.jface.text.BadLocationException; import org.eclipse.jface.text.BadPositionCategoryException; import org.eclipse.jface.text.DocumentEvent;
diff --git a/plugins/sqltools/org.eclipse.datatools.sqltools.sqleditor/src/org/eclipse/datatools/sqltools/sqleditor/internal/templates/SQLTemplateReaderWriter.java b/plugins/sqltools/org.eclipse.datatools.sqltools.sqleditor/src/org/eclipse/datatools/sqltools/sqleditor/internal/templates/SQLTemplateReaderWriter.java index 6a87505..1592f8e 100644 --- a/plugins/sqltools/org.eclipse.datatools.sqltools.sqleditor/src/org/eclipse/datatools/sqltools/sqleditor/internal/templates/SQLTemplateReaderWriter.java +++ b/plugins/sqltools/org.eclipse.datatools.sqltools.sqleditor/src/org/eclipse/datatools/sqltools/sqleditor/internal/templates/SQLTemplateReaderWriter.java
@@ -30,7 +30,7 @@ import javax.xml.transform.stream.StreamResult; import org.eclipse.datatools.sqltools.editor.template.SQLTemplate; -import org.eclipse.jface.text.Assert; +import org.eclipse.core.runtime.Assert; import org.eclipse.jface.text.templates.Template; import org.eclipse.jface.text.templates.persistence.TemplatePersistenceData; import org.w3c.dom.Attr;
diff --git a/plugins/sqltools/org.eclipse.datatools.sqltools.sqleditor/src/org/eclipse/datatools/sqltools/sqleditor/plan/GroupPlanSupportRunnable.java b/plugins/sqltools/org.eclipse.datatools.sqltools.sqleditor/src/org/eclipse/datatools/sqltools/sqleditor/plan/GroupPlanSupportRunnable.java index 54c6289..0fef9eb 100644 --- a/plugins/sqltools/org.eclipse.datatools.sqltools.sqleditor/src/org/eclipse/datatools/sqltools/sqleditor/plan/GroupPlanSupportRunnable.java +++ b/plugins/sqltools/org.eclipse.datatools.sqltools.sqleditor/src/org/eclipse/datatools/sqltools/sqleditor/plan/GroupPlanSupportRunnable.java
@@ -19,6 +19,7 @@ import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.Platform; import org.eclipse.core.runtime.Status; +import org.eclipse.core.runtime.jobs.Job; import org.eclipse.core.runtime.jobs.IJobManager; import org.eclipse.datatools.sqltools.core.DatabaseIdentifier; import org.eclipse.datatools.sqltools.core.SQLToolsFacade; @@ -117,7 +118,7 @@ protected IStatus run(IProgressMonitor monitor) { - IJobManager manager = Platform.getJobManager(); + IJobManager manager = Job.getJobManager(); if (monitor == null) { monitor = manager.createProgressGroup();
diff --git a/pom.xml b/pom.xml index a1d06f0..4cee709 100644 --- a/pom.xml +++ b/pom.xml
@@ -9,7 +9,7 @@ <properties> <tycho.scmUrl>scm:git:git://git.eclipse.org/gitroot/datatools/org.eclipse.datatools.git</tycho.scmUrl> - <tycho-version>1.4.0</tycho-version> + <tycho-version>1.5.0</tycho-version> <tycho-extras-version>${tycho-version}</tycho-extras-version> <maven-resources-version>2.6</maven-resources-version> @@ -18,7 +18,7 @@ <platform-repo.url>http://download.eclipse.org/eclipse/updates/I-builds/</platform-repo.url> <!-- <orbit-repo.url>http://download.eclipse.org/tools/orbit/I-builds/I20180829144012/repository/</orbit-repo.url> --> <orbit-repo.url>http://download.eclipse.org/tools/orbit/downloads/latest-I/</orbit-repo.url> - <emf-site>http://download.eclipse.org/modeling/emf/emf/builds/release/2.20/</emf-site> + <emf-site>http://download.eclipse.org/modeling/emf/emf/builds/release/2.22/</emf-site> <emf-query-site>http://download.eclipse.org/modeling/emf/query/updates/milestones/</emf-query-site> <mdt-ocl-site>http://download.eclipse.org/modeling/mdt/ocl/updates/releases/latest/</mdt-ocl-site> <gef-site>http://download.eclipse.org/tools/gef/updates/legacy/releases/4.0.0_gef-master_1952/</gef-site>
diff --git a/site/pom.xml b/site/pom.xml index c7cfb9c..7082467 100644 --- a/site/pom.xml +++ b/site/pom.xml
@@ -9,6 +9,6 @@ </parent> <groupId>org.eclipse.datatools</groupId> <artifactId>site</artifactId> - <version>1.14.106-SNAPSHOT</version> + <version>1.14.200-SNAPSHOT</version> <packaging>eclipse-repository</packaging> </project>