Move sqleditor, sqlscrapbook and server.extensions plugins to attic directory since they reference obsolete connectivity plugins. Will refactor and move them back later.
diff --git a/.project b/.project
new file mode 100644
index 0000000..daafb7a
--- /dev/null
+++ b/.project
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>org.eclipse.datatools.sqltools</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ </buildSpec>
+ <natures>
+ </natures>
+</projectDescription>
diff --git a/plugins/org.eclipse.datatools.sqltools.sqleditor/.classpath b/plugins/org.eclipse.datatools.sqltools.sqleditor/.classpath
deleted file mode 100644
index 751c8f2..0000000
--- a/plugins/org.eclipse.datatools.sqltools.sqleditor/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="src" path="src"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/plugins/org.eclipse.datatools.sqltools.sqleditor/.cvsignore b/plugins/org.eclipse.datatools.sqltools.sqleditor/.cvsignore
deleted file mode 100644
index 7fae7d6..0000000
--- a/plugins/org.eclipse.datatools.sqltools.sqleditor/.cvsignore
+++ /dev/null
@@ -1,4 +0,0 @@
-bin
-temp.folder
-build.xml
-sqleditor.jar
diff --git a/plugins/org.eclipse.datatools.sqltools.sqleditor/.project b/plugins/org.eclipse.datatools.sqltools.sqleditor/.project
deleted file mode 100644
index a482a47..0000000
--- a/plugins/org.eclipse.datatools.sqltools.sqleditor/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.datatools.sqltools.sqleditor</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.ManifestBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.SchemaBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.pde.PluginNature</nature>
- <nature>org.eclipse.jdt.core.javanature</nature>
- </natures>
-</projectDescription>
diff --git a/plugins/org.eclipse.datatools.sqltools.sqleditor/about.html b/plugins/org.eclipse.datatools.sqltools.sqleditor/about.html
deleted file mode 100644
index 6f6b96c..0000000
--- a/plugins/org.eclipse.datatools.sqltools.sqleditor/about.html
+++ /dev/null
@@ -1,22 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
-<head>
-<title>About</title>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
-
-<p>February 24, 2005</p>
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in ("Content"). Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, "Program" will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is being redistributed by another party ("Redistributor") and different terms and conditions may
-apply to your use of any object code in the Content. Check the Redistributor's license that was provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content.</p>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/plugins/org.eclipse.datatools.sqltools.sqleditor/build.properties b/plugins/org.eclipse.datatools.sqltools.sqleditor/build.properties
deleted file mode 100644
index cf18ea4..0000000
--- a/plugins/org.eclipse.datatools.sqltools.sqleditor/build.properties
+++ /dev/null
@@ -1,7 +0,0 @@
-source.sqleditor.jar = src/
-output.sqleditor.jar = bin/
-bin.includes = plugin.xml,\
- sqleditor.jar,\
- icons/,\
- plugin.properties,\
- about.html
diff --git a/plugins/org.eclipse.datatools.sqltools.sqleditor/icons/column.gif b/plugins/org.eclipse.datatools.sqltools.sqleditor/icons/column.gif
deleted file mode 100644
index 256e5a0..0000000
--- a/plugins/org.eclipse.datatools.sqltools.sqleditor/icons/column.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.datatools.sqltools.sqleditor/icons/schema.gif b/plugins/org.eclipse.datatools.sqltools.sqleditor/icons/schema.gif
deleted file mode 100644
index a653cf7..0000000
--- a/plugins/org.eclipse.datatools.sqltools.sqleditor/icons/schema.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.datatools.sqltools.sqleditor/icons/sql_editor.gif b/plugins/org.eclipse.datatools.sqltools.sqleditor/icons/sql_editor.gif
deleted file mode 100644
index 9425e4c..0000000
--- a/plugins/org.eclipse.datatools.sqltools.sqleditor/icons/sql_editor.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.datatools.sqltools.sqleditor/icons/table.gif b/plugins/org.eclipse.datatools.sqltools.sqleditor/icons/table.gif
deleted file mode 100644
index 9bee723..0000000
--- a/plugins/org.eclipse.datatools.sqltools.sqleditor/icons/table.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.datatools.sqltools.sqleditor/plugin.properties b/plugins/org.eclipse.datatools.sqltools.sqleditor/plugin.properties
deleted file mode 100644
index 46dbe63..0000000
--- a/plugins/org.eclipse.datatools.sqltools.sqleditor/plugin.properties
+++ /dev/null
@@ -1,18 +0,0 @@
-###############################################################################
-# Copyright (c) 2005 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 is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IBM Corporation - initial API and implementation
-###############################################################################
-#
-# Plugin resource strings for the SQL Editor
-#
-pluginName = SQL Source Editor Plugin
-providerName = Eclipse.org
-sqlEditorName = SQL Source Editor
-sqlEditorFileExtensions = sql
-documentSetupParticipantName = SQL Editor Document Setup Participant
diff --git a/plugins/org.eclipse.datatools.sqltools.sqleditor/plugin.xml b/plugins/org.eclipse.datatools.sqltools.sqleditor/plugin.xml
deleted file mode 100644
index 72ddd90..0000000
--- a/plugins/org.eclipse.datatools.sqltools.sqleditor/plugin.xml
+++ /dev/null
@@ -1,72 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<plugin
- id="org.eclipse.datatools.sqltools.sqleditor"
- name="%pluginName"
- version="0.7.0"
- provider-name="%providerName"
- class="org.eclipse.datatools.sqltools.sqleditor.internal.SQLEditorPlugin">
-
- <runtime>
- <library name="sqleditor.jar">
- <export name="*"/>
- </library>
- </runtime>
-
- <requires>
- <!-- Eclipse Platform and Workbench plugins -->
- <import plugin="org.eclipse.core.resources"/>
- <import plugin="org.eclipse.core.runtime"/>
- <import plugin="org.eclipse.jface.text" export="true"/>
- <import plugin="org.eclipse.ui"/>
- <import plugin="org.eclipse.ui.editors" export="true"/>
- <import plugin="org.eclipse.ui.ide"/>
- <import plugin="org.eclipse.ui.views" export="true"/>
- <import plugin="org.eclipse.ui.workbench.texteditor" export="true"/>
-
- <!-- Eclipse Web Tools Project plugins -->
- <import plugin="org.eclipse.datatools.connectivity.connection.ui"/>
- <import plugin="org.eclipse.datatools.connectivity.core"/>
- <import plugin="org.eclipse.datatools.connectivity.core.ui"/>
- <import plugin="org.eclipse.datatools.connectivity.server.ui"/>
- <import plugin="org.eclipse.datatools.modelbase.sql"/>
- </requires>
-
- <!-- Register the SQL Editor and the Action Contributor class for the SQL Editor. -->
- <extension
- point="org.eclipse.ui.editors">
- <editor
- id="org.eclipse.datatools.sqltools.sqleditor.SQLEditor"
- name="%sqlEditorName"
- icon=""
- class="org.eclipse.datatools.sqltools.sqleditor.internal.SQLEditor"
- contributorClass="org.eclipse.datatools.sqltools.sqleditor.internal.SQLEditorActionContributor">
- </editor>
- </extension>
-
-<!-- Register the DocumentSetupParticipant class for the SQL Editor. -->
-<!-- Note: In order to make the SQL Editor more reusable, the DocumentSetupParticipant
- is set up in the main SQL Editor class rather than here.
- <extension
- point="org.eclipse.core.filebuffers.documentSetup"
- id="SQLEditorDocumentSetupParticipant"
- name="%documentSetupParticipantName">
- <participant
- extensions="%sqlEditorFileExtensions"
- class="org.eclipse.datatools.sqltools.sqleditor.SQLEditorDocumentSetupParticipant">
- </participant>
- </extension>
--->
-
- <!-- Register a factory for recreating SQLEditorFileEditorInput objects when
- the Workbench is restarted. -->
- <extension
- point = "org.eclipse.ui.elementFactories">
- <factory
- id ="org.eclipse.datatools.sqltools.sqleditor.SQLEditorInputFactory"
- class="org.eclipse.datatools.sqltools.sqleditor.internal.SQLEditorInputFactory">
- </factory>
- </extension>
-
-
-</plugin>
diff --git a/plugins/org.eclipse.datatools.sqltools.sqleditor/src/org/eclipse/datatools/sqltools/sqleditor/internal/SQLEditorActionContributor.java b/plugins/org.eclipse.datatools.sqltools.sqleditor/src/org/eclipse/datatools/sqltools/sqleditor/internal/SQLEditorActionContributor.java
deleted file mode 100644
index 2dedf7b..0000000
--- a/plugins/org.eclipse.datatools.sqltools.sqleditor/src/org/eclipse/datatools/sqltools/sqleditor/internal/SQLEditorActionContributor.java
+++ /dev/null
@@ -1,152 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 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 is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.datatools.sqltools.sqleditor.internal;
-
-import java.util.ResourceBundle;
-
-import org.eclipse.datatools.sqltools.sqleditor.internal.actions.SQLConnectAction;
-import org.eclipse.datatools.sqltools.sqleditor.internal.actions.SQLDisconnectAction;
-import org.eclipse.datatools.sqltools.sqleditor.internal.actions.SQLRunAction;
-import org.eclipse.datatools.sqltools.sqleditor.internal.actions.SQLSetStatementTerminatorAction;
-import org.eclipse.datatools.sqltools.sqleditor.internal.utils.SQLStatementTerminatorSupport;
-import org.eclipse.jface.action.IMenuManager;
-import org.eclipse.jface.action.Separator;
-import org.eclipse.jface.util.IPropertyChangeListener;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.IWorkbenchActionConstants;
-import org.eclipse.ui.editors.text.TextEditorActionContributor;
-import org.eclipse.ui.part.EditorActionBarContributor;
-import org.eclipse.ui.texteditor.ITextEditor;
-import org.eclipse.ui.texteditor.RetargetTextEditorAction;
-
-/**
- * This class installs and manages actions for the SQL Editor.
- */
-public class SQLEditorActionContributor extends TextEditorActionContributor {
-
- protected RetargetTextEditorAction fContentAssistProposalAction;
- protected RetargetTextEditorAction fContentAssistTipAction;
- protected RetargetTextEditorAction fContentFormatAction;
- private IPropertyChangeListener fConnectActionListener;
- private IPropertyChangeListener fSetStatementTerminatorActionListener;
-
- /**
- * Constructs an instance of this class. This is the default constructor.
- */
- public SQLEditorActionContributor() {
- super();
- ResourceBundle bundle = SQLEditorResources.getResourceBundle();
-
- fContentAssistProposalAction = new RetargetTextEditorAction( bundle, "ContentAssistProposal." ); // $NON-NLS-1$
- fContentAssistTipAction = new RetargetTextEditorAction( bundle, "ContentAssistTip." ); // $NON-NLS-1$
- fContentFormatAction = new RetargetTextEditorAction( bundle, "ContentFormat." ); // $NON-NLS-1$
- }
-
- /**
- * Contributes items to the Workbench Edit menu.
- *
- * @param mm the MenuManager to use
- */
- public void contributeToMenu( IMenuManager mm ) {
- IMenuManager editMenu = mm.findMenuUsingPath( IWorkbenchActionConstants.M_EDIT );
- if (editMenu != null) {
- editMenu.add( new Separator() );
- editMenu.add( fContentAssistProposalAction );
- editMenu.add( fContentFormatAction );
- editMenu.add( fContentAssistTipAction );
- }
- }
-
- /**
- * Sets the active editor to this contributor.
- * This updates the actions to reflect the current editor.
- *
- * @see org.eclipse.ui.part.EditorActionBarContributor#setActiveEditor(org.eclipse.ui.IEditorPart)
- * @see EditorActionBarContributor#editorChanged
- */
- public void setActiveEditor( IEditorPart targetEditor ) {
- super.setActiveEditor( targetEditor );
-
- ITextEditor textEditor = null;
- if (targetEditor instanceof ITextEditor) {
- textEditor = (ITextEditor) targetEditor;
- }
-
- // Set up the standard text editor actions. These actions each have an
- // "retargetable action" associated with them. The action needs to be
- // "retargeted" to associate it with the active editor whenever the active
- // editor changes.
- fContentAssistProposalAction.setAction( getAction( textEditor, "ContentAssistProposal" )); // $NON-NLS-1$
- fContentAssistTipAction.setAction( getAction( textEditor, "ContentAssistTip" )); // $NON-NLS-1$
- fContentFormatAction.setAction( getAction( textEditor, "ContentFormat" )); // $NON-NLS-1$
-
- // Get and set up the other actions associated with this editor.
- SQLConnectAction connectAction = (SQLConnectAction) getAction( textEditor, "SQLEditor.connectAction" ); // $NON-NLS-1$
- SQLDisconnectAction disconnectAction = (SQLDisconnectAction) getAction( textEditor, "SQLEditor.disconnectAction" ); // $NON-NLS-1$
- SQLRunAction runAction = (SQLRunAction) getAction( textEditor, "SQLEditor.runAction" ); // $NON-NLS-1$
- SQLSetStatementTerminatorAction setStatementTerminatorAction =
- (SQLSetStatementTerminatorAction) getAction( textEditor, "SQLEditor.setStatementTerminatorAction" ); // $NON-NLS-1$
-
- if (targetEditor instanceof SQLEditor) {
- SQLEditor sqlEditor = (SQLEditor) targetEditor;
-
- // Set up the Connect action.
- if (connectAction != null) {
- connectAction.setSQLEditor( sqlEditor );
-
- // Set the SQL editor as a listener on the connect action so that it
- // will be informed if the connection changes. First remove any
- // existing listener.
- if (fConnectActionListener != null) {
- connectAction.removePropertyChangeListener( fConnectActionListener );
- }
- fConnectActionListener = sqlEditor;
- connectAction.addPropertyChangeListener( fConnectActionListener );
- }
-
- // Set up the Disconnect action.
- if (disconnectAction != null) {
- disconnectAction.setSQLEditor( sqlEditor );
-
- // Set the SQL editor as a listener on the disconnect action so that it
- // will be informed if the connection changes. First remove any
- // existing listener.
- if (fConnectActionListener != null) {
- disconnectAction.removePropertyChangeListener( fConnectActionListener );
- }
- fConnectActionListener = sqlEditor;
- disconnectAction.addPropertyChangeListener( fConnectActionListener );
- }
-
- // Set up the Run action.
- if (runAction != null) {
- runAction.setSQLEditor( sqlEditor );
- }
-
- // Set up the Set Statement Terminator action.
- if (setStatementTerminatorAction != null) {
- setStatementTerminatorAction.setSQLEditor( sqlEditor );
-
- // Set up the SQL editor as a listener on the set statement
- // terminator action so that it will be informed when the
- // statement terminator changes. First remove any existing
- // listener.
- if (fSetStatementTerminatorActionListener != null) {
- setStatementTerminatorAction.removePropertyChangeListener( fSetStatementTerminatorActionListener );
- }
- SQLStatementTerminatorSupport statementTerminatorSupport = sqlEditor.getSQLStatementTerminatorSupport();
- fSetStatementTerminatorActionListener = statementTerminatorSupport;
- setStatementTerminatorAction.addPropertyChangeListener( fSetStatementTerminatorActionListener );
- }
- }
- }
-
-} // end class
diff --git a/plugins/org.eclipse.datatools.sqltools.sqleditor/src/org/eclipse/datatools/sqltools/sqleditor/internal/SQLEditorDocumentSetupParticipant.java b/plugins/org.eclipse.datatools.sqltools.sqleditor/src/org/eclipse/datatools/sqltools/sqleditor/internal/SQLEditorDocumentSetupParticipant.java
deleted file mode 100644
index 4f20d3b..0000000
--- a/plugins/org.eclipse.datatools.sqltools.sqleditor/src/org/eclipse/datatools/sqltools/sqleditor/internal/SQLEditorDocumentSetupParticipant.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 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 is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.datatools.sqltools.sqleditor.internal;
-
-import org.eclipse.core.filebuffers.IDocumentSetupParticipant;
-import org.eclipse.datatools.sqltools.sqleditor.internal.sql.SQLPartitionScanner;
-import org.eclipse.jface.text.IDocument;
-import org.eclipse.jface.text.IDocumentExtension3;
-import org.eclipse.jface.text.IDocumentPartitioner;
-import org.eclipse.jface.text.rules.DefaultPartitioner;
-
-/**
- * This class implements the <code>IDocumentSetupParticipant</code> interface in
- * order to setup document partitioning for SQL documents.
- */
-public class SQLEditorDocumentSetupParticipant implements IDocumentSetupParticipant {
-
- /**
- * Sets up the document to be ready for use by a text file buffer.
- *
- * @see org.eclipse.core.filebuffers.IDocumentSetupParticipant#setup(org.eclipse.jface.text.IDocument)
- */
- public void setup( IDocument document ) {
- if (document instanceof IDocumentExtension3) {
- IDocumentExtension3 extension3 = (IDocumentExtension3) document;
- IDocumentPartitioner partitioner = new DefaultPartitioner( SQLEditorPlugin.getDefault().getSQLPartitionScanner(), SQLPartitionScanner.SQL_PARTITION_TYPES );
- partitioner.connect( document );
- extension3.setDocumentPartitioner( SQLEditorPlugin.SQL_PARTITIONING, partitioner );
- }
- }
-}
diff --git a/plugins/org.eclipse.datatools.sqltools.sqleditor/src/org/eclipse/datatools/sqltools/sqleditor/internal/SQLEditorPlugin.java b/plugins/org.eclipse.datatools.sqltools.sqleditor/src/org/eclipse/datatools/sqltools/sqleditor/internal/SQLEditorPlugin.java
deleted file mode 100644
index 805ea21..0000000
--- a/plugins/org.eclipse.datatools.sqltools.sqleditor/src/org/eclipse/datatools/sqltools/sqleditor/internal/SQLEditorPlugin.java
+++ /dev/null
@@ -1,101 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 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 is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.datatools.sqltools.sqleditor.internal;
-
-import org.eclipse.datatools.sqltools.sqleditor.internal.sql.SQLCodeScanner;
-import org.eclipse.datatools.sqltools.sqleditor.internal.sql.SQLPartitionScanner;
-import org.eclipse.datatools.sqltools.sqleditor.internal.utils.SQLColorProvider;
-import org.eclipse.jface.text.rules.RuleBasedScanner;
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-import org.osgi.framework.BundleContext;
-
-/**
- * The main plugin class.
- */
-public class SQLEditorPlugin extends AbstractUIPlugin {
- public final static String SQL_PARTITIONING= "__sql_partitioning"; //$NON-NLS-1$
-
- private static SQLEditorPlugin fgInstance;
- private SQLPartitionScanner fPartitionScanner;
- private SQLColorProvider fColorProvider;
- private SQLCodeScanner fCodeScanner;
-
- /**
- * Constructs an instance of this class. This is the default constructor.
- */
- public SQLEditorPlugin() {
- super();
- fgInstance = this;
- }
-
- /**
- * Handles plug-in activation.
- *
- * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext)
- * @see org.eclipse.core.runtime.Plugin#start(org.osgi.framework.BundleContext)
- */
- public void start( BundleContext context ) throws Exception {
- super.start( context );
- }
-
- /**
- * Handles plug-in deactivation.
- *
- * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext)
- * @see org.eclipse.core.runtime.Plugin#stop(org.osgi.framework.BundleContext)
- */
- public void stop( BundleContext context ) throws Exception {
- super.stop( context );
- }
-
- /**
- * Returns the shared instance of this plug-in.
- *
- * @return the shared instance of this plug-in
- */
- public static SQLEditorPlugin getDefault() {
- return fgInstance;
- }
-
- /**
- * Get a scanner for creating SQL partitions.
- *
- * @return the SQL partition scanner
- */
- public SQLPartitionScanner getSQLPartitionScanner() {
- if (fPartitionScanner == null)
- fPartitionScanner = new SQLPartitionScanner();
- return fPartitionScanner;
- }
-
- /**
- * Gets a SQL code scanner.
- *
- * @return the SQL code scanner
- */
- public RuleBasedScanner getSQLCodeScanner() {
- if (fCodeScanner == null)
- fCodeScanner = new SQLCodeScanner( getSQLColorProvider() );
- return fCodeScanner;
- }
-
- /**
- * Gets a SQL color provider.
- *
- * @return the SQL color provider
- */
- public SQLColorProvider getSQLColorProvider() {
- if (fColorProvider == null)
- fColorProvider = new SQLColorProvider();
- return fColorProvider;
- }
-
-} // end class
diff --git a/plugins/org.eclipse.datatools.sqltools.sqleditor/src/org/eclipse/datatools/sqltools/sqleditor/internal/SQLEditorResources.java b/plugins/org.eclipse.datatools.sqltools.sqleditor/src/org/eclipse/datatools/sqltools/sqleditor/internal/SQLEditorResources.java
deleted file mode 100644
index db340b3..0000000
--- a/plugins/org.eclipse.datatools.sqltools.sqleditor/src/org/eclipse/datatools/sqltools/sqleditor/internal/SQLEditorResources.java
+++ /dev/null
@@ -1,110 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 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 is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.datatools.sqltools.sqleditor.internal;
-
-import java.net.URL;
-import java.text.MessageFormat;
-import java.util.MissingResourceException;
-import java.util.ResourceBundle;
-
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.jface.resource.ImageRegistry;
-import org.eclipse.swt.graphics.Image;
-
-public class SQLEditorResources {
-
- private static final String RESOURCE_BUNDLE = "org.eclipse.datatools.sqltools.sqleditor.internal.SQLEditorResources"; //$NON-NLS-1$
-
- private static ResourceBundle fgResourceBundle;
-
- /* This constructor is private so can't create an instance of this class.
- */
- private SQLEditorResources() {
- }
-
- /**
- * Gets the image (.gif file) corresponding to the given key.
- *
- * @return the requested image, or <code>null</code> if not found
- */
- public static Image getImage( String key ) {
- ImageRegistry imageRegistry = SQLEditorPlugin.getDefault().getImageRegistry();
- Image image = imageRegistry.get( key );
- if (image == null) {
- ImageDescriptor descriptor = null;
- try {
- URL baseURL = SQLEditorPlugin.getDefault().getBundle().getEntry("/"); //$NON-NLS-1$
- URL imageURL = new URL( baseURL, "icons" + java.io.File.separator + key + ".gif" ); //$NON-NLS-1$ //$NON-NLS-2$
- descriptor = ImageDescriptor.createFromURL( imageURL );
- }
- catch (Exception e) {
- }
- if (descriptor != null) {
- imageRegistry.put( key, descriptor );
- image = imageRegistry.get(key);
- }
- }
- return image;
- }
-
- /**
- * Gets the resource string identified by the given resource key.
- * Returns "!<key>!" if resource not found.
- *
- * @param key the key of the desired resource
- * @return the desired resource string
- */
- public static String getString( String key ) {
- String str = null;
- ResourceBundle bundle = getResourceBundle();
- try {
- str = (bundle != null) ? bundle.getString( key ) : key;
- } catch (MissingResourceException e) {
- str = "!" + key + "!";//$NON-NLS-2$ //$NON-NLS-1$
- }
- return str;
- }
-
- /**
- * Gets the resource string identified by the given resource key,
- * with the given substitutions array. The contents of the substitutions
- * array are spliced into the resource string in place of parameter
- * markers {0}, {1}, etc. in the string.
- *
- * @param key the key of the desired resource
- * @param substitutions an array containing substitions
- * @return the desired resource string, with substitutions
- */
- public static String getString( String key, Object[] substitutions ) {
- String str = getString( key );
- if (substitutions != null)
- str = MessageFormat.format( str, substitutions );
- return str;
- }
-
- /**
- * Gets the resource bundle associated with this plug-in, or <code>null</code>
- * if not found.
- *
- * @return the plug-in's resource bundle
- */
- public static ResourceBundle getResourceBundle() {
- if (fgResourceBundle == null) {
- try {
- fgResourceBundle = ResourceBundle.getBundle( RESOURCE_BUNDLE );
- } catch (MissingResourceException x) {
- fgResourceBundle = null;
- }
- }
- return fgResourceBundle;
- }
-
-} // end class
diff --git a/plugins/org.eclipse.datatools.sqltools.sqleditor/src/org/eclipse/datatools/sqltools/sqleditor/internal/SQLEditorResources.properties b/plugins/org.eclipse.datatools.sqltools.sqleditor/src/org/eclipse/datatools/sqltools/sqleditor/internal/SQLEditorResources.properties
deleted file mode 100644
index d637607..0000000
--- a/plugins/org.eclipse.datatools.sqltools.sqleditor/src/org/eclipse/datatools/sqltools/sqleditor/internal/SQLEditorResources.properties
+++ /dev/null
@@ -1,72 +0,0 @@
-## *******************************************************************************
-## Copyright (c) 2000, 2005 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 is available at
-## http://www.eclipse.org/legal/epl-v10.html
-##
-## Contributors:
-## IBM Corporation - initial API and implementation
-## *******************************************************************************/
-
-## Resources for the standard editor actions
-
-ContentAssistProposal.label =Co&ntent Assist@Ctrl+SPACE
-ContentAssistProposal.tooltip =Content Assist
-ContentAssistProposal.image =
-ContentAssistProposal.description =Content Assist
-
-ContentAssistTip.label =Content Tip@Ctrl+SHIFT+SPACE
-ContentAssistTip.tooltip =Content Tip
-ContentAssistTip.image =
-ContentAssistTip.description =Content Tip
-
-ContentFormat.label =F&ormat SQL@Ctrl+SHIFT+F
-ContentFormat.tooltip =Format SQL
-ContentFormat.image =
-ContentFormat.description =Format SQL source
-
-## Resources for SQL Editor-specific actions
-
-# Note: the image entry is the relative path from the xxxAction.class file to the yyy.gif file
-SQLEditor.connectAction.label =Connect to Data&base
-SQLEditor.connectAction.tooltip =Select or create a database connection
-SQLEditor.connectAction.image =
-SQLEditor.connectAction.description =Select or create the database connection for this editor
-
-SQLEditor.disconnectAction.label =Disconnect fro&m Database
-SQLEditor.disconnectAction.tooltip =Disconnect the editor from the database
-SQLEditor.disconnectAction.image =
-SQLEditor.disconnectAction.description =Disconnect the editor from connected the database
-
-SQLEditor.runAction.label =Run S&QL
-SQLEditor.runAction.tooltip =Run the SQL statements
-SQLEditor.runAction.image =
-SQLEditor.runAction.description =Run the SQL statements in the editor on the connected database
-
-SQLEditor.setStatementTerminatorAction.label =Set Statement T&erminator
-SQLEditor.setStatementTerminatorAction.tooltip =Set the statement terminator
-SQLEditor.setStatementTerminatorAction.image =
-SQLEditor.setStatementTerminatorAction.description =Set the string that the editor should use to separate SQL statements
-
-## Resources for the Set Statement Terminator dialog and composite panel
-
-SQLEditor.setStatementTerminatorDialog.title = Set Statement Terminator
-SQLEditor.setStatementTerminatorDialog.prompt = Statement terminator:
-
-## Resources for the Outline view
-
-SQLEditor.outlinePage.sqlSegment.titlePattern=position {0}
-
-## Resources for the database connection management
-
-SQLEditor.connection.status.noConnection = No connection
-SQLEditor.connection.errorDialog.title = Connection Exception
-SQLeditor.connection.errorDialog.message = Connection has failed. The following error was reported:\n"{0}"
-
-## Miscellaneous resources
-
-SQLEditor.textHover.emptySelection=empty selection
-SQLEditor.error.save.message=Save could not be completed. {0}
-SQLEditor.error.save.title=Problems During Save As...
-SQLEditor.warning.save.delete=The original file ''{0}'' has been deleted.
diff --git a/plugins/org.eclipse.datatools.sqltools.sqleditor/src/org/eclipse/datatools/sqltools/sqleditor/internal/actions/SQLConnectAction.java b/plugins/org.eclipse.datatools.sqltools.sqleditor/src/org/eclipse/datatools/sqltools/sqleditor/internal/actions/SQLConnectAction.java
deleted file mode 100644
index f6f669a..0000000
--- a/plugins/org.eclipse.datatools.sqltools.sqleditor/src/org/eclipse/datatools/sqltools/sqleditor/internal/actions/SQLConnectAction.java
+++ /dev/null
@@ -1,96 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 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 is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.datatools.sqltools.sqleditor.internal.actions;
-
-import java.util.ResourceBundle;
-
-import org.eclipse.datatools.connectivity.internal.core.connection.ConnectionInfo;
-import org.eclipse.datatools.sqltools.sqleditor.internal.SQLEditor;
-import org.eclipse.ui.texteditor.ResourceAction;
-
-/**
- * This class implements the "Connect" action for the SQL Editor.
- *
- * @see org.eclipse.datatools.sqltools.sqleditor.internal.SQLEditorActionContributor
- * @see org.eclipse.ui.texteditor.ResourceAction
- */
-public class SQLConnectAction extends ResourceAction {
- public static final String CONNECTION = "Connection"; //$NON-NLS-1$
-
- private ConnectionInfo fConnInfo;
- private SQLEditor fSQLEditor;
-
- /**
- * Creates an instance of this class using the given resource bundle
- * and prefix of a set of resources within the bundle.
- *
- * @param bundle the resource bundle to use
- * @param prefix the resource prefix to use
- */
- public SQLConnectAction( ResourceBundle bundle, String prefix ) {
- super( bundle, prefix );
- }
-
- /**
- * Gets the current <code>ConnectionInfo</code> object associated with this
- * action.
- *
- * @return the current <code>ConnectionInfo</code> object
- */
- public ConnectionInfo getConnectionInfo() {
- return fConnInfo;
- }
-
- /**
- * Gets the SQLEditor instance associated with this action.
- *
- * @return the SQLEditor instance for this action
- */
- public SQLEditor getSQLEditor() {
- return fSQLEditor;
- }
-
- /**
- * Runs this action. Prompts the user to specify a database connection
- * to use with this editor.
- *
- * @see org.eclipse.jface.action.IAction#run()
- */
- public void run() {
- SQLEditor editor = getSQLEditor();
- if (editor != null) {
- ConnectionInfo newConnInfo = editor.requestConnectionFromUser();
- if (newConnInfo != null) {
- firePropertyChange( CONNECTION, getConnectionInfo(), newConnInfo );
- setConnectionInfo( newConnInfo );
- }
- }
- }
-
- /**
- * Sets the current <code>ConnectionInfo</code> object to the given object.
- *
- * @param connInfo the <code>ConnectionInfo</code> object to set
- */
- public void setConnectionInfo( ConnectionInfo connInfo ) {
- fConnInfo = connInfo;
- }
-
- /**
- * Sets the SQLEditor instance associated with this action to the given object.
- *
- * @param sqlEditor the SQLEditor instance for this action
- */
- public void setSQLEditor( SQLEditor sqlEditor ) {
- fSQLEditor = sqlEditor;
- }
-
-} // end class
diff --git a/plugins/org.eclipse.datatools.sqltools.sqleditor/src/org/eclipse/datatools/sqltools/sqleditor/internal/actions/SQLDisconnectAction.java b/plugins/org.eclipse.datatools.sqltools.sqleditor/src/org/eclipse/datatools/sqltools/sqleditor/internal/actions/SQLDisconnectAction.java
deleted file mode 100644
index ffe35f9..0000000
--- a/plugins/org.eclipse.datatools.sqltools.sqleditor/src/org/eclipse/datatools/sqltools/sqleditor/internal/actions/SQLDisconnectAction.java
+++ /dev/null
@@ -1,73 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 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 is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.datatools.sqltools.sqleditor.internal.actions;
-
-import java.util.ResourceBundle;
-
-import org.eclipse.datatools.connectivity.internal.core.connection.ConnectionInfo;
-import org.eclipse.datatools.sqltools.sqleditor.internal.SQLEditor;
-import org.eclipse.ui.texteditor.ResourceAction;
-
-/**
- * This class implements the "Disconnect" action for the SQL Editor.
- *
- * @see org.eclipse.datatools.sqltools.sqleditor.internal.SQLEditorActionContributor
- * @see org.eclipse.ui.texteditor.ResourceAction
- */
-public class SQLDisconnectAction extends ResourceAction {
-
- private SQLEditor fSQLEditor;
-
- /**
- * Creates an instance of this class using the given resource bundle
- * and prefix of a set of resources within the bundle.
- *
- * @param bundle the resource bundle to use
- * @param prefix the resource prefix to use
- */
- public SQLDisconnectAction( ResourceBundle bundle, String prefix ) {
- super( bundle, prefix );
- }
-
- /**
- * Gets the SQLEditor instance associated with this action.
- *
- * @return the SQLEditor instance for this action
- */
- public SQLEditor getSQLEditor() {
- return fSQLEditor;
- }
-
- /**
- * Runs this action. Disconnects the editor from the currently connected database.
- *
- * @see org.eclipse.jface.action.IAction#run()
- */
- public void run() {
- SQLEditor editor = getSQLEditor();
- if (editor != null) {
- ConnectionInfo connInfo = editor.getConnectionInfo();
- if (connInfo != null) {
- firePropertyChange( SQLConnectAction.CONNECTION, connInfo, null );
- }
- }
- }
-
- /**
- * Sets the SQLEditor instance associated with this action to the given object.
- *
- * @param sqlEditor the SQLEditor instance for this action
- */
- public void setSQLEditor( SQLEditor sqlEditor ) {
- fSQLEditor = sqlEditor;
- }
-
-} // end class
diff --git a/plugins/org.eclipse.datatools.sqltools.sqleditor/src/org/eclipse/datatools/sqltools/sqleditor/internal/editor/SQLEditorContentOutlinePage.java b/plugins/org.eclipse.datatools.sqltools.sqleditor/src/org/eclipse/datatools/sqltools/sqleditor/internal/editor/SQLEditorContentOutlinePage.java
deleted file mode 100644
index e7b77d0..0000000
--- a/plugins/org.eclipse.datatools.sqltools.sqleditor/src/org/eclipse/datatools/sqltools/sqleditor/internal/editor/SQLEditorContentOutlinePage.java
+++ /dev/null
@@ -1,286 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 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 is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.datatools.sqltools.sqleditor.internal.editor;
-
-import org.eclipse.datatools.sqltools.sqleditor.internal.SQLEditor;
-import org.eclipse.datatools.sqltools.sqleditor.internal.sql.SQLSegment;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.LabelProvider;
-import org.eclipse.jface.viewers.SelectionChangedEvent;
-import org.eclipse.jface.viewers.TreeViewer;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.ui.texteditor.IDocumentProvider;
-import org.eclipse.ui.views.contentoutline.ContentOutlinePage;
-
-/**
- * This class provides a content outline page for the SQL Editor.
- */
-public class SQLEditorContentOutlinePage extends ContentOutlinePage {
-
- protected Object fInput;
- protected IDocumentProvider fDocumentProvider;
- protected SQLEditor fSQLEditor;
-
- // TODO: fix this...it's just an example, hard-coded to have 10 segments
-// /**
-// * Divides the editor's document into ten segments and provides elements for them.
-// */
-// protected class ContentProvider implements ITreeContentProvider {
-//
-// protected final static String SEGMENTS= "__sql_segments"; //$NON-NLS-1$
-// protected IPositionUpdater fPositionUpdater= new DefaultPositionUpdater( SEGMENTS );
-// protected List fContent= new ArrayList(10);
-//
-//
-// /**
-// * Parses the given document into segments.
-// * @param document the document to parse
-// */
-// protected void parse( IDocument document ) {
-//
-// int lines = document.getNumberOfLines();
-// int increment = Math.max(Math.round(lines / 10), 10);
-//
-// for (int line = 0; line < lines; line += increment) {
-//
-// int length = increment;
-// if (line + increment > lines)
-// length = lines - line;
-//
-// try {
-// int offset = document.getLineOffset( line );
-// int end = document.getLineOffset( line + length );
-// length = end - offset;
-// Position p = new Position( offset, length );
-// document.addPosition( SEGMENTS, p );
-// fContent.add( new Segment( MessageFormat.format("position {0}", new Object[] { new Integer(offset) }), p)); //$NON-NLS-1$
-// //fContent.add( new Segment( MessageFormat.format(SQLEditorPlugin.getResourceString( "OutlinePage.segment.title_pattern" ), new Object[] { new Integer(offset) }), p)); //$NON-NLS-1$
-//
-// } catch (BadPositionCategoryException x) {
-// } catch (BadLocationException x) {
-// }
-// }
-// }
-//
-// /**
-// * Notifies this content provider that the given viewer's input
-// * has been switched to a different element.
-// * @see IContentProvider#inputChanged(Viewer, Object, Object)
-// */
-// public void inputChanged( Viewer viewer, Object oldInput, Object newInput ) {
-// if (oldInput != null) {
-// IDocument document= fDocumentProvider.getDocument( oldInput );
-// if (document != null) {
-// try {
-// document.removePositionCategory( SEGMENTS );
-// } catch (BadPositionCategoryException x) {
-// }
-// document.removePositionUpdater( fPositionUpdater );
-// }
-// }
-//
-// fContent.clear();
-//
-// if (newInput != null) {
-// IDocument document= fDocumentProvider.getDocument( newInput );
-// if (document != null) {
-// document.addPositionCategory( SEGMENTS );
-// document.addPositionUpdater( fPositionUpdater );
-//
-// parse( document );
-// }
-// }
-// }
-//
-// /**
-// * Disposes of this content provider.
-// * This is called by the viewer when it is disposed.
-// * @see IContentProvider#dispose
-// */
-// public void dispose() {
-// if (fContent != null) {
-// fContent.clear();
-// fContent= null;
-// }
-// }
-//
-// /**
-// * Returns the child elements of the given parent element.
-// * @see ITreeContentProvider#getChildren(Object)
-// */
-// public Object[] getChildren( Object element ) {
-// if (element == fInput)
-// return fContent.toArray();
-// return new Object[0];
-// }
-//
-// /**
-// * Returns the elements to display in the viewer when its input is set
-// * to the given element.
-// * @see IStructuredContentProvider#getElements(Object)
-// */
-// public Object[] getElements( Object element ) {
-// return fContent.toArray();
-// }
-//
-// /**
-// * Returns the parent for the given element, or <code>null</code>
-// * indicating that the parent can't be computed.
-// * @see ITreeContentProvider#getParent(Object)
-// */
-// public Object getParent( Object element ) {
-// if (element instanceof Segment)
-// return fInput;
-// return null;
-// }
-//
-// /**
-// * Returns whether the given element has children.
-// * @see ITreeContentProvider#hasChildren(Object)
-// */
-// public boolean hasChildren( Object element ) {
-// return element == fInput;
-// }
-//
-// } // end inner class ContentProvider
-
- /**
- * Constructs an instance of this class using the given provider and the given editor.
- *
- * @param provider the document provider to use
- * @param sqlEditor the SQL text editor associated with this view
- */
- public SQLEditorContentOutlinePage( IDocumentProvider provider, SQLEditor sqlEditor ) {
- super();
- fDocumentProvider = provider;
- fSQLEditor = sqlEditor;
- }
-
- /**
- * Creates the SWT control for this page under the given parent control.
- * The <code>ContentOutlinePage</code> implementation of this
- * <code>IContentOutlinePage</code> method creates a tree viewer.
- *
- * @see org.eclipse.ui.views.contentoutline.ContentOutlinePage#createControl(org.eclipse.swt.widgets.Composite)
- * @see org.eclipse.ui.part.IPage#createControl(org.eclipse.swt.widgets.Composite)
- */
- public void createControl( Composite parent ) {
- super.createControl( parent );
-
- TreeViewer viewer = getTreeViewer();
- viewer.setContentProvider( new SQLEditorOutlineContentProvider( this ));
- viewer.setLabelProvider( new LabelProvider() );
- viewer.addSelectionChangedListener( this );
-
- if (fInput != null)
- viewer.setInput( fInput );
- }
-
- /**
- * Gets the document provider associated with this outline page.
- *
- * @return the document provider
- */
- public IDocumentProvider getDocumentProvider() {
- return fDocumentProvider;
- }
-
- /**
- * Gets the input for this outline page.
- *
- * @return the input for this outline page
- */
- public Object getInput() {
- return fInput;
- }
-
- /**
- * Gets the SQL Editor associated with this outline page.
- *
- * @return the associated SQL Editor
- */
- public SQLEditor getSQLEditor() {
- return fSQLEditor;
- }
-
- /**
- * Notifies that the selection has changed, using the given SelectionChangedEvent.
- *
- * @see org.eclipse.jface.viewers.ISelectionChangedListener#selectionChanged(org.eclipse.jface.viewers.SelectionChangedEvent)
- */
- public void selectionChanged( SelectionChangedEvent event ) {
-
- super.selectionChanged( event );
-
- ISelection selection = event.getSelection();
- if (selection.isEmpty())
- fSQLEditor.resetHighlightRange();
- else {
- SQLSegment segment = (SQLSegment) ((IStructuredSelection) selection).getFirstElement();
- int start = segment.getPosition().getOffset();
- int length = segment.getPosition().getLength();
- try {
- fSQLEditor.setHighlightRange( start, length, true );
- } catch (IllegalArgumentException x) {
- fSQLEditor.resetHighlightRange();
- }
- }
- }
-
- /**
- * Sets the document provider associated with this outline page to the given
- * document provider.
- *
- * @param docProvider the document provider to use
- */
- public void setDocumentProvider( IDocumentProvider docProvider ) {
- fDocumentProvider = docProvider;
- }
-
- /**
- * Sets the input of this outline page to the given object.
- *
- * @param input the input to set
- */
- public void setInput( Object input ) {
- fInput = input;
- update();
- }
-
- /**
- * Sets the SQL Editor associated with this outline page to the given editor.
- *
- * @param sqlEditor the associated SQL Editor
- */
- public void setSQLEditor( SQLEditor sqlEditor ) {
- fSQLEditor = sqlEditor;
- }
-
- /**
- * Updates the outline page.
- */
- public void update() {
- TreeViewer viewer = getTreeViewer();
-
- if (viewer != null) {
- Control control = viewer.getControl();
- if (control != null && !control.isDisposed()) {
- control.setRedraw( false );
- viewer.setInput( fInput );
- viewer.expandAll();
- control.setRedraw( true );
- }
- }
- }
-
-} // end class
diff --git a/plugins/org.eclipse.datatools.sqltools.sqleditor/src/org/eclipse/datatools/sqltools/sqleditor/internal/editor/SQLEditorOutlineContentProvider.java b/plugins/org.eclipse.datatools.sqltools.sqleditor/src/org/eclipse/datatools/sqltools/sqleditor/internal/editor/SQLEditorOutlineContentProvider.java
deleted file mode 100644
index b0dea05..0000000
--- a/plugins/org.eclipse.datatools.sqltools.sqleditor/src/org/eclipse/datatools/sqltools/sqleditor/internal/editor/SQLEditorOutlineContentProvider.java
+++ /dev/null
@@ -1,338 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 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 is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.datatools.sqltools.sqleditor.internal.editor;
-
-import java.text.MessageFormat;
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.datatools.sqltools.sqleditor.internal.SQLEditorResources;
-import org.eclipse.jface.text.BadLocationException;
-import org.eclipse.jface.text.BadPositionCategoryException;
-import org.eclipse.jface.text.DefaultPositionUpdater;
-import org.eclipse.jface.text.IDocument;
-import org.eclipse.jface.text.IPositionUpdater;
-import org.eclipse.jface.text.Position;
-import org.eclipse.jface.viewers.ITreeContentProvider;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.ui.texteditor.IDocumentProvider;
-
-/**
- * This class implements a content provider for the SQL Editor outline page.
- */
-public class SQLEditorOutlineContentProvider implements ITreeContentProvider {
-
- /** The outline page associated with this outline content provider. */
- private SQLEditorContentOutlinePage fOutlinePage = null;
-
- /** A list of segments. */
- private List fContent = null;
-
- /** A category identifier for SQL segments. */
- public final static String SQL_SEGMENTS = "__sql_segments__"; //$NON-NLS-1$
-
- /** A position updater for document changes. */
- private IPositionUpdater fPositionUpdater = null;
-
- /**
- * This class implements a simple segment for the SQL Editor outline view.
- */
- protected static class SQLSegment {
- public String name;
- public Position position;
-
- public SQLSegment( String name, Position position ) {
- this.name= name;
- this.position= position;
- }
-
- public String toString() {
- return name;
- }
- } // end inner class
-
- /**
- * Constructs an instance of this class with the given outline page.
- *
- * @param outlinePage associated outline page
- */
- public SQLEditorOutlineContentProvider( SQLEditorContentOutlinePage outlinePage ) {
- super();
-
- fOutlinePage = outlinePage;
- fContent = new ArrayList();
- fPositionUpdater = new DefaultPositionUpdater( SQL_SEGMENTS );
- }
-
- /**
- * Disposes of this content provider. This is called by the viewer when
- * it is disposed.
- */
- public void dispose() {
- // do nothing
- }
-
- /**
- * Returns the child elements of the given parent element.
- * <p>
- * The difference between this method and
- * <code>IStructuredContentProvider.getElements</code> is that
- * <code>getElements</code> is called to obtain the tree viewer's root
- * elements, whereas <code>getChildren</code> is used to obtain the
- * children of a given parent element in the tree (including a root).
- * </p>
- * The result is not modified by the viewer.
- *
- * @param parentElement the parent element
- * @return an array of child elements
- */
- public Object[] getChildren( Object element ) {
- Object[] children = new Object[0];
- if (hasChildren( element )) {
- children = fContent.toArray();
- }
-
- return children;
- }
-
- /**
- * Returns the elements to display in the viewer when its input is set to
- * the given element. These elements can be presented as rows in a table,
- * items in a list, etc. The result is not modified by the viewer.
- *
- * @param inputElement the input element
- * @return the array of elements to display in the viewer
- */
- public Object[] getElements( Object inputElement ) {
- return fContent.toArray();
- }
-
- /**
- * Returns the parent for the given element, or <code>null</code>
- * indicating that the parent can't be computed. In this case the
- * tree-structured viewer can't expand a given node correctly if requested.
- *
- * @param element the element
- * @return the parent element, or <code>null</code> if it has none or if
- * the parent cannot be computed
- */
- public Object getParent(Object element) {
- return null;
- }
-
- /**
- * Returns whether the given element has children.
- * <p>
- * Intended as an optimization for when the viewer does not need the actual
- * children. Clients may be able to implement this more efficiently than
- * <code>getChildren</code>.
- * </p>
- *
- * @param element the element
- * @return <code>true</code> if the given element has children, and
- * <code>false</code> if it has no children
- */
- public boolean hasChildren( Object element ) {
- boolean value = false;
- if (element == fOutlinePage.getInput()) {
- value = true;
- }
- return value;
- }
-
- /**
- * Notifies this content provider that the given viewer's input has been
- * switched to a different element.
- * <p>
- * A typical use for this method is registering the content provider as a
- * listener to changes on the new input (using model-specific means), and
- * deregistering the viewer from the old input. In response to these change
- * notifications, the content provider propagates the changes to the viewer.
- * </p>
- *
- * @param viewer the viewer
- * @param oldInput the old input element, or <code>null</code> if the viewer
- * did not previously have an input
- * @param newInput the new input element, or <code>null</code> if the viewer
- * does not have an input
- */
- public void inputChanged( Viewer viewer, Object oldInput, Object newInput ) {
-
- if (newInput != null && newInput != oldInput) {
- IDocumentProvider docProvider = fOutlinePage.getDocumentProvider();
- if (oldInput != null) {
- IDocument document = docProvider.getDocument( oldInput );
- if (document != null) {
- try {
- document.removePositionCategory( SQL_SEGMENTS );
- } catch (BadPositionCategoryException x) {
- }
- document.removePositionUpdater( fPositionUpdater );
- // document.removeDocumentListener( fOutlinePage.getDocumentListener() );
- // document.removeDocumentPartitioningListener( this );
- }
- }
-
- fContent.clear();
-
- if (newInput != null) {
- IDocument document = docProvider.getDocument( newInput );
- document.addPositionCategory( SQL_SEGMENTS );
- document.addPositionUpdater( fPositionUpdater );
- // document.addDocumentListener( fOutlinePage.getDocumentListener() );
- // document.addDocumentPartitioningListener( this );
-
- parse( document );
- }
- }
-
- if (newInput == null) {
- fContent.clear();
- }
- }
-
- /**
- * Parses the given document into segments. The segments are added to
- * fContent.
- *
- * @param document the document to parse
- */
- public void parse( IDocument document ) {
- // Determine all partitions, and their positions, convert to segments
- // and add the segments to the outline.
-
- int lines = document.getNumberOfLines();
- int increment = Math.max( Math.round(lines / 10), 10 );
-
- for (int line= 0; line < lines; line += increment) {
-
- int length = increment;
- if (line + increment > lines)
- length = lines - line;
-
- try {
- int offset = document.getLineOffset( line );
- int end = document.getLineOffset( line + length );
- length = end - offset;
- Position p = new Position( offset, length );
- document.addPosition( SQL_SEGMENTS, p );
- String segmentLabel = MessageFormat.format( SQLEditorResources.getString( "SQLEditor.outlinePage.sqlSegment.titlePattern" ), //$NON-NLS-1$
- new Object[] { new Integer( offset )});
- fContent.add( new SQLSegment( segmentLabel, p)); //$NON-NLS-1$
-
- } catch (BadPositionCategoryException x) {
- } catch (BadLocationException x) {
- }
- }
-
-// int offset = 0;
-// while (offset < document.getLength()) {
-// try {
-// ITypedRegion region = document.getPartition( offset );
-// Position p = null;
-// // Create a segment only if it is not a comment.
-// String partitionId = region.getType();
-// if (partitionId == IDocument.DEFAULT_CONTENT_TYPE) {
-// String docSegment = document.get( region.getOffset(), region.getLength() );
-// String statement = docSegment.trim();
-//
-// // Get rid of leading and trailing whitespace
-// // If contains non-blank characters - invalid
-// if (statement.length() > 0) {
-// int relativeOffset = 0;
-// int length = 0;
-// // Find the position of a broken string within segment.
-// for (int i = 0; i < (docSegment.length() - statement.length() + 1); i++) {
-// if (docSegment.regionMatches(i, statement, 0,
-// statement.length())) {
-// relativeOffset = i;
-// break;
-// }
-// }
-// // Error - non-whitespace characters.
-// SQLSegment partSegment = new SQLSegment();
-// p = new Position( region.getOffset() + relativeOffset, statement.length() );
-// partSegment.setValid( false );
-// partSegment.setType( IDocument.DEFAULT_CONTENT_TYPE );
-// partSegment.setPartitionLabel( SQLEditorResources.getString( "STR_INVALID_STATEMENT" ));
-// // Prepare the statement for display in task list. First trim
-// // it down if it's too long to display nicely.
-// if (statement.length() > 175) {
-// statement = statement.substring(0, 175);
-// }
-// statement.replace( 'n', ' ' );
-// partSegment.setMessage( SQLEditorResources.getString( "STR_INVALID_STATEMENT") + " " + statement );
-// partSegment.setPosition( p );
-// fContent.add( partSegment );
-// document.addPosition( SQL_SEGMENTS, p );
-// }
-// } else if (partitionId == SQLPartitionScanner.SQL_UNKNOWNSQL) {
-// p = new Position( region.getOffset(), region.getLength() );
-// SQLSegment partSegment = new SQLSegment();
-// String docSegment = document.get( region.getOffset(), region.getLength() );
-// partSegment.setValid( true );
-// partSegment.setType( SQLPartitionScanner.SQL_UNKNOWNSQL );
-// //String label = SQLEditorContentOutlinePage.getRenderStringFromDoc( docSegment.trim() );
-// String label = "temporary label";
-// partSegment.setPartitionLabel( label + " ..." );
-// partSegment.setMessage( SQLEditorResources.getString( "STR_INVALID_STATEMENT" ) + label + " ..." );
-// partSegment.setPosition( p );
-// fContent.add( partSegment );
-// document.addPosition( SQL_SEGMENTS, p );
-// } else if (partitionId != SQLPartitionScanner.SQL_COMMENT) {
-// p = new Position( region.getOffset(), region.getLength() );
-// SQLSegment partSegment;
-// String docSegment = document.get( region.getOffset(), region.getLength() );
-//// partSegment = SegmentFactory.createSegment( docSegment, p, region.getType(), fVendorType );
-// partSegment = new SQLSegment();
-// fContent.add( partSegment );
-// document.addPosition( SQL_SEGMENTS, p );
-// }
-// offset += region.getLength();
-// } catch (BadPositionCategoryException x) {
-// } catch (BadLocationException x) {
-// }
-// }
-//
-// try {
-// Position[] category = document.getPositions( SQL_SEGMENTS );
-// } catch (BadPositionCategoryException e) {
-// e.printStackTrace();
-// }
- }
-
- /**
- * Gets the content of this outline view, as a list.
- *
- * @return the outline content
- */
-
- public List getContent() {
- return fContent;
- }
-
- /**
- * Clears the outline content.
- */
- public void clearContent() {
- fContent.clear();
- }
-
- /**
- * Gets the position udater.
- *
- * @return the position updater
- */
- public IPositionUpdater getPositionUpdater() {
- return fPositionUpdater;
- }
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.datatools.sqltools.sqleditor/src/org/eclipse/datatools/sqltools/sqleditor/internal/editor/SQLSourceViewer.java b/plugins/org.eclipse.datatools.sqltools.sqleditor/src/org/eclipse/datatools/sqltools/sqleditor/internal/editor/SQLSourceViewer.java
deleted file mode 100644
index ad622ee..0000000
--- a/plugins/org.eclipse.datatools.sqltools.sqleditor/src/org/eclipse/datatools/sqltools/sqleditor/internal/editor/SQLSourceViewer.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 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 is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.datatools.sqltools.sqleditor.internal.editor;
-
-import org.eclipse.jface.text.source.IOverviewRuler;
-import org.eclipse.jface.text.source.IVerticalRuler;
-import org.eclipse.jface.text.source.projection.ProjectionViewer;
-import org.eclipse.swt.widgets.Composite;
-
-/**
- * This class implements a source viewer for editing SQL source text. This
- * class extends <code>ProjectViewer</code> in order to get the source folding
- * capability.
- *
- * @see org.eclipse.jface.text.source.projection.ProjectionViewer
- */
-public class SQLSourceViewer extends ProjectionViewer {
-
- /**
- * Creates an instance of this class with the given parameters.
- *
- * @param parent the SWT parent control
- * @param ruler the vertical ruler (annotation area)
- * @param overviewRuler the overview ruler
- * @param showsAnnotationOverview <code>true</code> if the overview ruler should be shown
- * @param styles the SWT style bits
- */
- public SQLSourceViewer( Composite parent, IVerticalRuler ruler,
- IOverviewRuler overviewRuler, boolean showsAnnotationOverview,
- int styles ) {
- super( parent, ruler, overviewRuler, showsAnnotationOverview, styles );
- }
-
-}
diff --git a/plugins/org.eclipse.datatools.sqltools.sqleditor/src/org/eclipse/datatools/sqltools/sqleditor/internal/editor/SQLSourceViewerConfiguration.java b/plugins/org.eclipse.datatools.sqltools.sqleditor/src/org/eclipse/datatools/sqltools/sqleditor/internal/editor/SQLSourceViewerConfiguration.java
deleted file mode 100644
index 3415bf1..0000000
--- a/plugins/org.eclipse.datatools.sqltools.sqleditor/src/org/eclipse/datatools/sqltools/sqleditor/internal/editor/SQLSourceViewerConfiguration.java
+++ /dev/null
@@ -1,247 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 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 is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.datatools.sqltools.sqleditor.internal.editor;
-
-import org.eclipse.datatools.sqltools.sqleditor.internal.SQLEditor;
-import org.eclipse.datatools.sqltools.sqleditor.internal.SQLEditorPlugin;
-import org.eclipse.datatools.sqltools.sqleditor.internal.sql.ISQLDBProposalsService;
-import org.eclipse.datatools.sqltools.sqleditor.internal.sql.SQLAnnotationHover;
-import org.eclipse.datatools.sqltools.sqleditor.internal.sql.SQLAutoIndentStrategy;
-import org.eclipse.datatools.sqltools.sqleditor.internal.sql.SQLCompletionProcessor;
-import org.eclipse.datatools.sqltools.sqleditor.internal.sql.SQLDoubleClickStrategy;
-import org.eclipse.datatools.sqltools.sqleditor.internal.sql.SQLPartitionScanner;
-import org.eclipse.datatools.sqltools.sqleditor.internal.sql.SQLTextHover;
-import org.eclipse.datatools.sqltools.sqleditor.internal.sql.SQLUpperCaseFormattingStrategy;
-import org.eclipse.datatools.sqltools.sqleditor.internal.utils.SQLColorProvider;
-import org.eclipse.jface.text.DefaultAutoIndentStrategy;
-import org.eclipse.jface.text.IAutoIndentStrategy;
-import org.eclipse.jface.text.IDocument;
-import org.eclipse.jface.text.ITextDoubleClickStrategy;
-import org.eclipse.jface.text.ITextHover;
-import org.eclipse.jface.text.TextAttribute;
-import org.eclipse.jface.text.contentassist.ContentAssistant;
-import org.eclipse.jface.text.contentassist.IContentAssistant;
-import org.eclipse.jface.text.formatter.ContentFormatter;
-import org.eclipse.jface.text.formatter.IContentFormatter;
-import org.eclipse.jface.text.formatter.IFormattingStrategy;
-import org.eclipse.jface.text.presentation.IPresentationReconciler;
-import org.eclipse.jface.text.presentation.PresentationReconciler;
-import org.eclipse.jface.text.rules.BufferedRuleBasedScanner;
-import org.eclipse.jface.text.rules.DefaultDamagerRepairer;
-import org.eclipse.jface.text.rules.Token;
-import org.eclipse.jface.text.source.IAnnotationHover;
-import org.eclipse.jface.text.source.ISourceViewer;
-import org.eclipse.jface.text.source.SourceViewerConfiguration;
-import org.eclipse.swt.graphics.RGB;
-
-/**
- * This class defines the editor add-ons; content assist, content formatter,
- * highlighting, auto-indent strategy, double click strategy.
- */
-public class SQLSourceViewerConfiguration extends SourceViewerConfiguration {
-
- /** The editor with which this configuration is associated. */
- private SQLEditor fEditor;
- /** The completion processor for completing the user's typing. */
- private SQLCompletionProcessor fCompletionProcessor;
- /** The content assist proposal service for database objects. */
- private ISQLDBProposalsService fDBProposalsService;
-
- /**
- * This class implements a single token scanner.
- */
- static class SingleTokenScanner extends BufferedRuleBasedScanner {
- public SingleTokenScanner( TextAttribute attribute ) {
- setDefaultReturnToken( new Token( attribute ));
- }
- }
-
- /**
- * Constructs an instance of this class with the given SQLEditor to
- * configure.
- *
- * @param editor the SQLEditor to configure
- */
- public SQLSourceViewerConfiguration( SQLEditor editor ) {
- fEditor = editor;
- fCompletionProcessor = new SQLCompletionProcessor();
- }
-
- /**
- * Returns the annotation hover which will provide the information to be
- * shown in a hover popup window when requested for the given
- * source viewer.
- *
- * @see org.eclipse.jface.text.source.SourceViewerConfiguration#getAnnotationHover(org.eclipse.jface.text.source.ISourceViewer)
- */
- public IAnnotationHover getAnnotationHover( ISourceViewer sourceViewer ) {
- return new SQLAnnotationHover();
- }
-
- /**
- * Returns the auto indentation strategy ready to be used with the given source viewer
- * when manipulating text of the given content type.
- *
- * @see org.eclipse.jface.text.source.SourceViewerConfiguration#getAutoIndentStrategy(org.eclipse.jface.text.source.ISourceViewer, java.lang.String)
- */
- public IAutoIndentStrategy getAutoIndentStrategy( ISourceViewer sourceViewer, String contentType ) {
- return (IDocument.DEFAULT_CONTENT_TYPE.equals( contentType ) ? new SQLAutoIndentStrategy() : new DefaultAutoIndentStrategy());
- }
-
- /**
- * Returns the configured partitioning for the given source viewer. The partitioning is
- * used when the querying content types from the source viewer's input document.
- *
- * @see org.eclipse.jface.text.source.SourceViewerConfiguration#getConfiguredDocumentPartitioning(org.eclipse.jface.text.source.ISourceViewer)
- */
- public String getConfiguredDocumentPartitioning( ISourceViewer sourceViewer ) {
- return SQLEditorPlugin.SQL_PARTITIONING;
- }
-
- /**
- * Creates, initializes, and returns the ContentAssistant to use with this editor.
- *
- * @see org.eclipse.jface.text.source.SourceViewerConfiguration#getContentAssistant(ISourceViewer)
- */
- public IContentAssistant getContentAssistant(ISourceViewer sourceViewer) {
- ContentAssistant assistant = new ContentAssistant();
-
- assistant.setDocumentPartitioning( getConfiguredDocumentPartitioning( sourceViewer ));
-
- // Set content assist processors for various content types.
- fCompletionProcessor = new SQLCompletionProcessor();
- assistant.setContentAssistProcessor( fCompletionProcessor, IDocument.DEFAULT_CONTENT_TYPE);
- ISQLDBProposalsService proposalsService = getDBProposalsService();
- if (proposalsService != null) {
- fCompletionProcessor.setDBProposalsService( proposalsService );
- }
-
- // Configure how content assist information will appear.
- assistant.enableAutoActivation( true );
- assistant.setAutoActivationDelay( 500 );
- assistant.setProposalPopupOrientation( IContentAssistant.PROPOSAL_STACKED );
- assistant.setContextInformationPopupOrientation( IContentAssistant.CONTEXT_INFO_ABOVE );
- assistant.setContextInformationPopupBackground( SQLEditorPlugin.getDefault().getSQLColorProvider().getColor( new RGB( 150, 150, 0 )));
- //Set to Carolina blue
-// assistant.setContextInformationPopupBackground( SQLEditorPlugin.getDefault().getSQLColorProvider().getColor( new RGB( 0, 191, 255 )));
-
- return assistant;
- }
-
- /**
- * Creates, configures, and returns the ContentFormatter to use.
- *
- * @see org.eclipse.jface.text.source.SourceViewerConfiguration#getContentFormatter(ISourceViewer)
- */
- public IContentFormatter getContentFormatter(ISourceViewer sourceViewer) {
- ContentFormatter formatter = new ContentFormatter();
- formatter.setDocumentPartitioning( SQLEditorPlugin.SQL_PARTITIONING );
-
- IFormattingStrategy formattingStrategy = new SQLUpperCaseFormattingStrategy();
- formatter.setFormattingStrategy( formattingStrategy, IDocument.DEFAULT_CONTENT_TYPE );
-
- return formatter;
- }
-
- /**
- * Gets the <code>DBProposalsService</code> object that provides content
- * assist services for this editor.
- *
- * @return the current <code>DBProposalsService</code> object
- */
- public ISQLDBProposalsService getDBProposalsService() {
- return fDBProposalsService;
- }
-
- /**
- * Returns the double-click strategy ready to be used in this viewer when double clicking
- * onto text of the given content type. (Note: the same double-click strategy
- * object is used for all content types.)
- *
- * @see org.eclipse.jface.text.source.SourceViewerConfiguration#getDoubleClickStrategy(ISourceViewer, String)
- */
- public ITextDoubleClickStrategy getDoubleClickStrategy( ISourceViewer sourceViewer, String contentType) {
- return new SQLDoubleClickStrategy();
- }
-
- /**
- * Creates, configures, and returns a presentation reconciler to help with
- * document changes.
- *
- * @see org.eclipse.jface.text.source.SourceViewerConfiguration#getPresentationReconciler(ISourceViewer)
- */
- public IPresentationReconciler getPresentationReconciler( ISourceViewer sourceViewer ) {
-
- // Get the color provider.
- SQLColorProvider colorProvider = getSQLEditor().getSQLColorProvider();
-
- // Create a presentation reconciler to handle handle document changes.
- PresentationReconciler reconciler = new PresentationReconciler();
- String docPartitioning = getConfiguredDocumentPartitioning( sourceViewer );
- reconciler.setDocumentPartitioning( docPartitioning );
-
- // Add a "damager-repairer" for changes in default text (SQL code).
- DefaultDamagerRepairer dr = new DefaultDamagerRepairer( getSQLEditor().getSQLCodeScanner() );
- reconciler.setDamager( dr, IDocument.DEFAULT_CONTENT_TYPE );
- reconciler.setRepairer( dr, IDocument.DEFAULT_CONTENT_TYPE );
-
- // Add a "damager-repairer" for changes witin one-line SQL comments.
- dr = new DefaultDamagerRepairer( new SingleTokenScanner( new TextAttribute( colorProvider.getColor( SQLColorProvider.SQL_COMMENT_COLOR ))));
- reconciler.setDamager( dr, SQLPartitionScanner.SQL_COMMENT );
- reconciler.setRepairer( dr, SQLPartitionScanner.SQL_COMMENT );
-
- // Add a "damager-repairer" for changes witin quoted literals.
- dr = new DefaultDamagerRepairer( new SingleTokenScanner( new TextAttribute( colorProvider.getColor( SQLColorProvider.SQL_QUOTED_LITERAL_COLOR ))));
- reconciler.setDamager( dr, SQLPartitionScanner.SQL_QUOTED_LITERAL );
- reconciler.setRepairer( dr, SQLPartitionScanner.SQL_QUOTED_LITERAL );
-
- // Add a "damager-repairer" for changes witin delimited identifiers.
- dr = new DefaultDamagerRepairer( new SingleTokenScanner( new TextAttribute( colorProvider.getColor( SQLColorProvider.SQL_DELIMITED_IDENTIFIER_COLOR ))));
- reconciler.setDamager( dr, SQLPartitionScanner.SQL_DELIMITED_IDENTIFIER );
- reconciler.setRepairer( dr, SQLPartitionScanner.SQL_DELIMITED_IDENTIFIER );
-
- return reconciler;
- }
-
- /**
- * Returns the SQLEditor associated with this object.
- *
- * @return the SQLEditor that this object configures
- */
- public SQLEditor getSQLEditor() {
- return fEditor;
- }
-
- /**
- * Returns the text hover which will provide the information to be shown
- * in a text hover popup window when requested for the given source viewer and
- * the given content type.
- *
- * @see org.eclipse.jface.text.source.SourceViewerConfiguration#getTextHover(org.eclipse.jface.text.source.ISourceViewer, java.lang.String)
- */
- public ITextHover getTextHover( ISourceViewer sourceViewer, String contentType ) {
- return new SQLTextHover();
- }
-
- /**
- * Sets the <code>ISQLDBProposalsService</code> object that provides content
- * assist services for this viewer to the given object.
- *
- * @param the <code>ISQLDBProposalsService</code> object to set
- */
- public void setDBProposalsService( ISQLDBProposalsService dbProposalsService ) {
- fDBProposalsService = dbProposalsService;
- if (fCompletionProcessor != null) {
- fCompletionProcessor.setDBProposalsService( dbProposalsService );
- }
- }
-
-} // end class
diff --git a/plugins/org.eclipse.datatools.sqltools.sqleditor/src/org/eclipse/datatools/sqltools/sqleditor/internal/sql/ISQLCompletionEngine.java b/plugins/org.eclipse.datatools.sqltools.sqleditor/src/org/eclipse/datatools/sqltools/sqleditor/internal/sql/ISQLCompletionEngine.java
deleted file mode 100644
index 6ef8d01..0000000
--- a/plugins/org.eclipse.datatools.sqltools.sqleditor/src/org/eclipse/datatools/sqltools/sqleditor/internal/sql/ISQLCompletionEngine.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 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 is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.datatools.sqltools.sqleditor.internal.sql;
-
-import org.eclipse.jface.text.IDocument;
-import org.eclipse.jface.text.ITypedRegion;
-import org.eclipse.jface.text.contentassist.ICompletionProposal;
-
-/**
- * Compute proposals.
- *
- * @author Hetty Dougherty
- *
- */
-public interface ISQLCompletionEngine {
-
- /**
- * Compute proposals
- *
- * @param doc The document
- * @param partition document partition
- * @param documentOffset current offset in the document
- *
- */
- public ICompletionProposal[] computeProposals( IDocument doc, ITypedRegion partition, int documentOffset );
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.datatools.sqltools.sqleditor/src/org/eclipse/datatools/sqltools/sqleditor/internal/sql/SQLAnnotationHover.java b/plugins/org.eclipse.datatools.sqltools.sqleditor/src/org/eclipse/datatools/sqltools/sqleditor/internal/sql/SQLAnnotationHover.java
deleted file mode 100644
index 0f0f374..0000000
--- a/plugins/org.eclipse.datatools.sqltools.sqleditor/src/org/eclipse/datatools/sqltools/sqleditor/internal/sql/SQLAnnotationHover.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 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 is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.datatools.sqltools.sqleditor.internal.sql;
-
-
-import org.eclipse.jface.text.BadLocationException;
-import org.eclipse.jface.text.IDocument;
-import org.eclipse.jface.text.IRegion;
-import org.eclipse.jface.text.source.IAnnotationHover;
-import org.eclipse.jface.text.source.ISourceViewer;
-
-/**
- * This class provides the hover (tooltip) support for the SQL editor.
- */
- public class SQLAnnotationHover implements IAnnotationHover {
-
- /**
- * Gets the text which should be presented in a hover popup window for
- * the given line number in the given source.
- *
- * @see org.eclipse.jface.text.source.IAnnotationHover#getHoverInfo(org.eclipse.jface.text.source.ISourceViewer, int)
- */
- public String getHoverInfo( ISourceViewer sourceViewer, int lineNumber ) {
- IDocument document = sourceViewer.getDocument();
-
- try {
- IRegion info = document.getLineInformation( lineNumber );
- return document.get( info.getOffset(), info.getLength() );
- } catch (BadLocationException x) {
- }
-
- return null;
- }
-}
diff --git a/plugins/org.eclipse.datatools.sqltools.sqleditor/src/org/eclipse/datatools/sqltools/sqleditor/internal/sql/SQLCodeScanner.java b/plugins/org.eclipse.datatools.sqltools.sqleditor/src/org/eclipse/datatools/sqltools/sqleditor/internal/sql/SQLCodeScanner.java
deleted file mode 100644
index a573283..0000000
--- a/plugins/org.eclipse.datatools.sqltools.sqleditor/src/org/eclipse/datatools/sqltools/sqleditor/internal/sql/SQLCodeScanner.java
+++ /dev/null
@@ -1,624 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 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 is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.datatools.sqltools.sqleditor.internal.sql;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.datatools.sqltools.sqleditor.internal.utils.SQLColorProvider;
-import org.eclipse.datatools.sqltools.sqleditor.internal.utils.SQLWordDetector;
-import org.eclipse.jface.text.TextAttribute;
-import org.eclipse.jface.text.rules.EndOfLineRule;
-import org.eclipse.jface.text.rules.IRule;
-import org.eclipse.jface.text.rules.IToken;
-import org.eclipse.jface.text.rules.IWhitespaceDetector;
-import org.eclipse.jface.text.rules.RuleBasedScanner;
-import org.eclipse.jface.text.rules.SingleLineRule;
-import org.eclipse.jface.text.rules.Token;
-import org.eclipse.jface.text.rules.WhitespaceRule;
-import org.eclipse.jface.text.rules.WordRule;
-import org.eclipse.swt.widgets.Display;
-
-/**
- * This class implements a RuleBaseScanner for SQL source code text.
- */
-public class SQLCodeScanner extends RuleBasedScanner {
-
- /** Defines the SQL keywords. */
- private static String[] fgKeywords = {
- "ABSOLUTE", //$NON-NLS-1$
- "ACQUIRE", //$NON-NLS-1$
- "ACTION", //$NON-NLS-1$
- "ADD", //$NON-NLS-1$
- "ALL", //$NON-NLS-1$
- "ALLOCATE", //$NON-NLS-1$
- "ALTER", //$NON-NLS-1$
- "AND", //$NON-NLS-1$
- "ANY", //$NON-NLS-1$
- "ARE", //$NON-NLS-1$
- "AS", //$NON-NLS-1$
- "ASC", //$NON-NLS-1$
- "ASSERTION", //$NON-NLS-1$
- "AT", //$NON-NLS-1$
- "AUDIT", //$NON-NLS-1$
- "AUTHORIZATION", //$NON-NLS-1$
- "AVG", //$NON-NLS-1$
- "BEGIN", //$NON-NLS-1$
- "BETWEEN", //$NON-NLS-1$
- "BIT_LENGTH", //$NON-NLS-1$
- "BOTH", //$NON-NLS-1$
- "BUFFERPOOL", //$NON-NLS-1$
- "BY", //$NON-NLS-1$
- "CALL", //$NON-NLS-1$
- "CAPTURE", //$NON-NLS-1$
- "CASCADED", //$NON-NLS-1$
- "CASE", //$NON-NLS-1$
- "CAST", //$NON-NLS-1$
- "CATALOG", //$NON-NLS-1$
- "CCSID", //$NON-NLS-1$
- "CHAR", //$NON-NLS-1$
- "CHAR_LENGTH", //$NON-NLS-1$
- "CHARACTER", //$NON-NLS-1$
- "CHARACTER_LENGTH", //$NON-NLS-1$
- "CHECK", //$NON-NLS-1$
- "CLOSE", //$NON-NLS-1$
- "CLUSTER", //$NON-NLS-1$
- "COALESCE", //$NON-NLS-1$
- "COLLATE", //$NON-NLS-1$
- "COLLATION", //$NON-NLS-1$
- "COLLECTION", //$NON-NLS-1$
- "COLUMN", //$NON-NLS-1$
- "COMMENT", //$NON-NLS-1$
- "COMMIT", //$NON-NLS-1$
- "CONCAT", //$NON-NLS-1$
- "CONNECT", //$NON-NLS-1$
- "CONNECTION", //$NON-NLS-1$
- "CONSTRAINT", //$NON-NLS-1$
- "CONSTRAINTS", //$NON-NLS-1$
- "CONTINUE", //$NON-NLS-1$
- "CONVERT", //$NON-NLS-1$
- "CORRESPONDING", //$NON-NLS-1$
- "COUNT", //$NON-NLS-1$
- "CREATE", //$NON-NLS-1$
- "CROSS", //$NON-NLS-1$
- "CURRENT", //$NON-NLS-1$
- "CURRENT_DATE", //$NON-NLS-1$
- "CURRENT_SERVER", //$NON-NLS-1$
- "CURRENT_TIME", //$NON-NLS-1$
- "CURRENT_TIMESTAMP", //$NON-NLS-1$
- "CURRENT_TIMEZONE", //$NON-NLS-1$
- "CURRENT_USER", //$NON-NLS-1$
- "CURSOR", //$NON-NLS-1$
- "DATABASE", //$NON-NLS-1$
- "DATE", //$NON-NLS-1$
- "DAY", //$NON-NLS-1$
- "DAYS", //$NON-NLS-1$
- "DBA", //$NON-NLS-1$
- "DBSPACE", //$NON-NLS-1$
- "DEALLOCATE", //$NON-NLS-1$
- "DEC", //$NON-NLS-1$
- "DECIMAL", //$NON-NLS-1$
- "DECLARE", //$NON-NLS-1$
- "DEFAULT", //$NON-NLS-1$
- "DEFERRABLE", //$NON-NLS-1$
- "DEFERRED", //$NON-NLS-1$
- "DELETE", //$NON-NLS-1$
- "DESC", //$NON-NLS-1$
- "DESCRIBE", //$NON-NLS-1$
- "DESCRIPTOR", //$NON-NLS-1$
- "DIAGNOSTICS", //$NON-NLS-1$
- "DISCONNECT", //$NON-NLS-1$
- "DISTINCT", //$NON-NLS-1$
- "DOMAIN", //$NON-NLS-1$
- "DOUBLE", //$NON-NLS-1$
- "DROP", //$NON-NLS-1$
- "EDITPROC", //$NON-NLS-1$
- "ELSE", //$NON-NLS-1$
- "END", //$NON-NLS-1$
- "END-EXEC", //$NON-NLS-1$
- "ERASE", //$NON-NLS-1$
- "ESCAPE", //$NON-NLS-1$
- "EXCEPT", //$NON-NLS-1$
- "EXCEPTION", //$NON-NLS-1$
- "EXCLUSIVE", //$NON-NLS-1$
- "EXECUTE", //$NON-NLS-1$
- "EXISTS", //$NON-NLS-1$
- "EXPLAIN", //$NON-NLS-1$
- "EXTERNAL", //$NON-NLS-1$
- "EXTRACT", //$NON-NLS-1$
- "FETCH", //$NON-NLS-1$
- "FIELDPROC", //$NON-NLS-1$
- "FIRST", //$NON-NLS-1$
- "FLOAT", //$NON-NLS-1$
- "FOR", //$NON-NLS-1$
- "FOREIGN", //$NON-NLS-1$
- "FOUND", //$NON-NLS-1$
- "FROM", //$NON-NLS-1$
- "FULL", //$NON-NLS-1$
- "FULL", //$NON-NLS-1$
- "GET", //$NON-NLS-1$
- "GLOBAL", //$NON-NLS-1$
- "GO", //$NON-NLS-1$
- "GOTO", //$NON-NLS-1$
- "GRANT", //$NON-NLS-1$
- "GRAPHIC", //$NON-NLS-1$
- "GROUP", //$NON-NLS-1$
- "HAVING", //$NON-NLS-1$
- "HOUR", //$NON-NLS-1$
- "HOURS", //$NON-NLS-1$
- "IDENTIFIED", //$NON-NLS-1$
- "IDENTITY", //$NON-NLS-1$
- "IMMEDIATE", //$NON-NLS-1$
- "IN", //$NON-NLS-1$
- "INDEX", //$NON-NLS-1$
- "INDICATOR", //$NON-NLS-1$
- "INITIALLY", //$NON-NLS-1$
- "INNER", //$NON-NLS-1$
- "INNER", //$NON-NLS-1$
- "INOUT", //$NON-NLS-1$
- "INPUT", //$NON-NLS-1$
- "INSENSITIVE", //$NON-NLS-1$
- "INSERT", //$NON-NLS-1$
- "INTERSECT", //$NON-NLS-1$
- "INTERVAL", //$NON-NLS-1$
- "INTO", //$NON-NLS-1$
- "IS", //$NON-NLS-1$
- "ISOLATION", //$NON-NLS-1$
- "JOIN", //$NON-NLS-1$
- "JOIN", //$NON-NLS-1$
- "KEY", //$NON-NLS-1$
- "LABEL", //$NON-NLS-1$
- "LANGUAGE", //$NON-NLS-1$
- "LAST", //$NON-NLS-1$
- "LEADING", //$NON-NLS-1$
- "LEFT", //$NON-NLS-1$
- "LEFT", //$NON-NLS-1$
- "LEVEL", //$NON-NLS-1$
- "LIKE", //$NON-NLS-1$
- "LOCAL", //$NON-NLS-1$
- "LOCK", //$NON-NLS-1$
- "LOCKSIZE", //$NON-NLS-1$
- "LONG", //$NON-NLS-1$
- "LOWER", //$NON-NLS-1$
- "MATCH", //$NON-NLS-1$
- "MAX", //$NON-NLS-1$
- "MICROSECOND", //$NON-NLS-1$
- "MICROSECONDS", //$NON-NLS-1$
- "MIN", //$NON-NLS-1$
- "MINUTE", //$NON-NLS-1$
- "MINUTES", //$NON-NLS-1$
- "MODE", //$NON-NLS-1$
- "MODULE", //$NON-NLS-1$
- "MONTH", //$NON-NLS-1$
- "MONTHS", //$NON-NLS-1$
- "NAMED", //$NON-NLS-1$
- "NAMES", //$NON-NLS-1$
- "NATIONAL", //$NON-NLS-1$
- "NATURAL", //$NON-NLS-1$
- "NCHAR", //$NON-NLS-1$
- "NEXT", //$NON-NLS-1$
- "NHEADER", //$NON-NLS-1$
- "NO", //$NON-NLS-1$
- "NOT", //$NON-NLS-1$
- "NULL", //$NON-NLS-1$
- "NULLIF", //$NON-NLS-1$
- "NUMERIC", //$NON-NLS-1$
- "NUMPARTS", //$NON-NLS-1$
- "OBID", //$NON-NLS-1$
- "OCTET_LENGTH", //$NON-NLS-1$
- "OF", //$NON-NLS-1$
- "ON", //$NON-NLS-1$
- "ONLY", //$NON-NLS-1$
- "OPEN", //$NON-NLS-1$
- "OPTIMIZE", //$NON-NLS-1$
- "OPTION", //$NON-NLS-1$
- "OR", //$NON-NLS-1$
- "ORDER", //$NON-NLS-1$
- "OUT", //$NON-NLS-1$
- "OUTER", //$NON-NLS-1$
- "OUTPUT", //$NON-NLS-1$
- "OVERLAPS", //$NON-NLS-1$
- "PACKAGE", //$NON-NLS-1$
- "PAD", //$NON-NLS-1$
- "PAGE", //$NON-NLS-1$
- "PAGES", //$NON-NLS-1$
- "PART", //$NON-NLS-1$
- "PARTIAL", //$NON-NLS-1$
- "PCTFREE", //$NON-NLS-1$
- "PCTINDEX", //$NON-NLS-1$
- "PLAN", //$NON-NLS-1$
- "POSITION", //$NON-NLS-1$
- "PRECISION", //$NON-NLS-1$
- "PREPARE", //$NON-NLS-1$
- "PRESERVE", //$NON-NLS-1$
- "PRIMARY", //$NON-NLS-1$
- "PRIOR", //$NON-NLS-1$
- "PRIQTY", //$NON-NLS-1$
- "PRIVATE", //$NON-NLS-1$
- "PRIVILEGES", //$NON-NLS-1$
- "PROCEDURE", //$NON-NLS-1$
- "PROGRAM", //$NON-NLS-1$
- "PUBLIC", //$NON-NLS-1$
- "READ", //$NON-NLS-1$
- "REAL", //$NON-NLS-1$
- "REFERENCES", //$NON-NLS-1$
- "RELATIVE", //$NON-NLS-1$
- "RELEASE", //$NON-NLS-1$
- "RESET", //$NON-NLS-1$
- "RESOURCE", //$NON-NLS-1$
- "REVOKE", //$NON-NLS-1$
- "RIGHT", //$NON-NLS-1$
- "RIGHT", //$NON-NLS-1$
- "ROLLBACK", //$NON-NLS-1$
- "ROW", //$NON-NLS-1$
- "ROWS", //$NON-NLS-1$
- "RRN", //$NON-NLS-1$
- "RUN", //$NON-NLS-1$
- "SCHEDULE", //$NON-NLS-1$
- "SCHEMA", //$NON-NLS-1$
- "SCROLL", //$NON-NLS-1$
- "SECOND", //$NON-NLS-1$
- "SECONDS", //$NON-NLS-1$
- "SECQTY", //$NON-NLS-1$
- "SECTION", //$NON-NLS-1$
- "SELECT", //$NON-NLS-1$
- "SESSION", //$NON-NLS-1$
- "SESSION_USER", //$NON-NLS-1$
- "SET", //$NON-NLS-1$
- "SHARE", //$NON-NLS-1$
- "SIMPLE", //$NON-NLS-1$
- "SIZE", //$NON-NLS-1$
- "SMALLINT", //$NON-NLS-1$
- "SOME", //$NON-NLS-1$
- "SPACE", //$NON-NLS-1$
- "SQL", //$NON-NLS-1$
- "SQLCODE", //$NON-NLS-1$
- "SQLERROR", //$NON-NLS-1$
- "SQLSTATE", //$NON-NLS-1$
- "STATISTICS", //$NON-NLS-1$
- "STOGROUP", //$NON-NLS-1$
- "STORPOOL", //$NON-NLS-1$
- "SUBPAGES", //$NON-NLS-1$
- "SUBSTRING", //$NON-NLS-1$
- "SUM", //$NON-NLS-1$
- "SYNONYM", //$NON-NLS-1$
- "SYSTEM_USER", //$NON-NLS-1$
- "TABLE", //$NON-NLS-1$
- "TABLESPACE", //$NON-NLS-1$
- "TEMPORARY", //$NON-NLS-1$
- "THEN", //$NON-NLS-1$
- "TIMEZONE_HOUR", //$NON-NLS-1$
- "TIMEZONE_MINUTE", //$NON-NLS-1$
- "TO", //$NON-NLS-1$
- "TRAILING", //$NON-NLS-1$
- "TRANSACTION", //$NON-NLS-1$
- "TRANSLATION", //$NON-NLS-1$
- "TRIM", //$NON-NLS-1$
- "UNION", //$NON-NLS-1$
- "UNIQUE", //$NON-NLS-1$
- "UNKNOWN", //$NON-NLS-1$
- "UPDATE", //$NON-NLS-1$
- "UPPER", //$NON-NLS-1$
- "USAGE", //$NON-NLS-1$
- "USER", //$NON-NLS-1$
- "USING", //$NON-NLS-1$
- "VALIDPROC", //$NON-NLS-1$
- "VALUE", //$NON-NLS-1$
- "VALUES", //$NON-NLS-1$
- "VARCHAR", //$NON-NLS-1$
- "VARIABLE", //$NON-NLS-1$
- "VARYING", //$NON-NLS-1$
- "VCAT", //$NON-NLS-1$
- "VIEW", //$NON-NLS-1$
- "VOLUMES", //$NON-NLS-1$
- "WHEN", //$NON-NLS-1$
- "WHENEVER", //$NON-NLS-1$
- "WHERE", //$NON-NLS-1$
- "WITH", //$NON-NLS-1$
- "WORK", //$NON-NLS-1$
- "WRITE", //$NON-NLS-1$
- "YEAR", //$NON-NLS-1$
- "YEARS", //$NON-NLS-1$
- "ZONE", //$NON-NLS-1$
- "FALSE", //$NON-NLS-1$
- "TRUE" //$NON-NLS-1$
- };
-
- /** Defines the SQL datatype names. */
- private static String[] fgDatatypes = {
- "INTEGER", //$NON-NLS-1$
- "SMALLINTEGER", //$NON-NLS-1$
- "BIGINT", //$NON-NLS-1$
- "DECIMAL", //$NON-NLS-1$
- "DOUBLE", //$NON-NLS-1$
- "REAL", //$NON-NLS-1$
- "TIME", //$NON-NLS-1$
- "TIMESTAMP", //$NON-NLS-1$
- "DATE", //$NON-NLS-1$
- "DATALINK", //$NON-NLS-1$
- "CHAR", //$NON-NLS-1$
- "VARCHAR", //$NON-NLS-1$
- "BLOB", //$NON-NLS-1$
- "CLOB", //$NON-NLS-1$
- "GRAPHIC", //$NON-NLS-1$
- "VARGRAPHIC", //$NON-NLS-1$
- "DBCLOB" //$NON-NLS-1$
- };
-
- /** Defines the SQL built-in function names. */
- private static String[] fgFunctions = {
- "ABS", //$NON-NLS-1$
- "ABSVAL", //$NON-NLS-1$
- "ACOS", //$NON-NLS-1$
- "ASCII", //$NON-NLS-1$
- "ASIN", //$NON-NLS-1$
- "ATAN", //$NON-NLS-1$
- "ATAN2", //$NON-NLS-1$
- "BIGINT", //$NON-NLS-1$
- "BLOB", //$NON-NLS-1$
- "CEILING", //$NON-NLS-1$
- "CHAR", //$NON-NLS-1$
- "CHR", //$NON-NLS-1$
- "CLOB", //$NON-NLS-1$
- "COALESCE", //$NON-NLS-1$
- "CONCAT", //$NON-NLS-1$
- "CORRELATION", //$NON-NLS-1$
- "COS", //$NON-NLS-1$
- "COT", //$NON-NLS-1$
- "COUNT", //$NON-NLS-1$
- "COUNT_BIG", //$NON-NLS-1$
- "COVARIANCE", //$NON-NLS-1$
- "DATE", //$NON-NLS-1$
- "DAY", //$NON-NLS-1$
- "DAYNAME", //$NON-NLS-1$
- "DAYOFWEEK", //$NON-NLS-1$
- "DAYOFWEEK_ISO", //$NON-NLS-1$
- "DAYOFYEAR", //$NON-NLS-1$
- "DAYS", //$NON-NLS-1$
- "DBCLOB", //$NON-NLS-1$
- "DECIMAL", //$NON-NLS-1$
- "DEGREES", //$NON-NLS-1$
- "DEREF", //$NON-NLS-1$
- "DIFFERENCE", //$NON-NLS-1$
- "DIGITS", //$NON-NLS-1$
- "DLCOMMENT", //$NON-NLS-1$
- "DLLINKTYPE", //$NON-NLS-1$
- "DLURLCOMPLETE", //$NON-NLS-1$
- "DLURLPATH", //$NON-NLS-1$
- "DLURLPATHONLY", //$NON-NLS-1$
- "DLURLSCHEME", //$NON-NLS-1$
- "DLURLSERVER", //$NON-NLS-1$
- "DLVALUE", //$NON-NLS-1$
- "DOUBLE", //$NON-NLS-1$
- "EVENT_MON_STATE", //$NON-NLS-1$
- "EXP", //$NON-NLS-1$
- "FLOAT", //$NON-NLS-1$
- "FLOOR", //$NON-NLS-1$
- "GENERATE_UNIQUE", //$NON-NLS-1$
- "GRAPHIC", //$NON-NLS-1$
- "GROUPING", //$NON-NLS-1$
- "HEX", //$NON-NLS-1$
- "HOUR", //$NON-NLS-1$
- "INSERT", //$NON-NLS-1$
- "INTEGER", //$NON-NLS-1$
- "JULIAN_DAY", //$NON-NLS-1$
- "LCASE", //$NON-NLS-1$
- "LCASE", //$NON-NLS-1$
- "LEFT", //$NON-NLS-1$
- "LENGTH", //$NON-NLS-1$
- "LN", //$NON-NLS-1$
- "LOCATE", //$NON-NLS-1$
- "LOG", //$NON-NLS-1$
- "LOG10", //$NON-NLS-1$
- "LONG_VARCHAR", //$NON-NLS-1$
- "LONG_VARGRAPHIC", //$NON-NLS-1$
- "LTRIM", //$NON-NLS-1$
- "LTRIM", //$NON-NLS-1$
- "MAX", //$NON-NLS-1$
- "MICROSECOND", //$NON-NLS-1$
- "MIDNIGHT_SECONDS", //$NON-NLS-1$
- "MIN", //$NON-NLS-1$
- "MINUTE", //$NON-NLS-1$
- "MOD", //$NON-NLS-1$
- "MONTH", //$NON-NLS-1$
- "MONTHNAME", //$NON-NLS-1$
- "NODENUMBER", //$NON-NLS-1$
- "NULLIF", //$NON-NLS-1$
- "PARTITION", //$NON-NLS-1$
- "POSSTR", //$NON-NLS-1$
- "POWER", //$NON-NLS-1$
- "QUARTER", //$NON-NLS-1$
- "RADIANS", //$NON-NLS-1$
- "RAISE_ERROR", //$NON-NLS-1$
- "RAND", //$NON-NLS-1$
- "REAL", //$NON-NLS-1$
- "REPEAT", //$NON-NLS-1$
- "REPLACE", //$NON-NLS-1$
- "RIGHT", //$NON-NLS-1$
- "ROUND", //$NON-NLS-1$
- "RTRIM", //$NON-NLS-1$
- "RTRIM", //$NON-NLS-1$
- "SECOND", //$NON-NLS-1$
- "SIGN", //$NON-NLS-1$
- "SIN", //$NON-NLS-1$
- "SMALLINT", //$NON-NLS-1$
- "SOUNDEX", //$NON-NLS-1$
- "SPACE", //$NON-NLS-1$
- "SQLCACHE_SNAPSHOT", //$NON-NLS-1$
- "SQRT", //$NON-NLS-1$
- "STDDEV", //$NON-NLS-1$
- "SUBSTR", //$NON-NLS-1$
- "SUM", //$NON-NLS-1$
- "TABLE_NAME", //$NON-NLS-1$
- "TABLE_SCHEMA", //$NON-NLS-1$
- "TAN", //$NON-NLS-1$
- "TIME", //$NON-NLS-1$
- "TIMESTAMP", //$NON-NLS-1$
- "TIMESTAMP_ISO", //$NON-NLS-1$
- "TIMESTAMPDIFF", //$NON-NLS-1$
- "TRANSLATE", //$NON-NLS-1$
- "TRUNCATE", //$NON-NLS-1$
- "TRUNC", //$NON-NLS-1$
- "TYPE_ID", //$NON-NLS-1$
- "TYPE_NAME", //$NON-NLS-1$
- "TYPE_SCHEMA", //$NON-NLS-1$
- "UCASE", //$NON-NLS-1$
- "UPPER", //$NON-NLS-1$
- "VALUE", //$NON-NLS-1$
- "VARCHAR", //$NON-NLS-1$
- "VARGRAPHIC", //$NON-NLS-1$
- "VARIANCE", //$NON-NLS-1$
- "WEEK", //$NON-NLS-1$
- "WEEK_ISO", //$NON-NLS-1$
- "YEAR" //$NON-NLS-1$
- };
-
- /** Defines an array of arrays that combines all the SQL language elements defined previously. */
- private static Object[] fgAllWords = { fgKeywords, fgDatatypes, fgFunctions };
-
- /**
- * This class determines if a character is a whitespace character.
- */
- public class SQLWhiteSpaceDetector implements IWhitespaceDetector {
-
- /**
- * Determines if the given character is a whitespace character.
- * @see org.eclipse.jface.text.rules.IWhitespaceDetector#isWhitespace(char)
- */
- public boolean isWhitespace( char c ) {
- return Character.isWhitespace( c );
- }
-
- } // end inner class
-
- /**
- * Constructs an instance of this class using the given color provider.
- */
- public SQLCodeScanner( SQLColorProvider colorProvider ) {
- // Define tokens for the SQL language elements.
- IToken commentToken = null;
- IToken stringToken = null;
- IToken keywordToken = null;
- IToken datatypeToken = null;
- IToken functionToken = null;
-// IToken identifierToken = null;
- IToken delimitedIdentifierToken = null;
- IToken otherToken = null;
-
- /* On "high contrast" displays the default text color (black) is a problem,
- * since the normal high contrast background is black. ("High contrast" is
- * a Windows feature that helps vision-impaired people.) When high contrast mode is enabled,
- * use different colors that show up better against a black background.
- */
- if (Display.getDefault().getHighContrast() == true) {
- commentToken = new Token( new TextAttribute( colorProvider.getColor( SQLColorProvider.SQL_HC_COMMENT_COLOR )));
- stringToken = new Token( new TextAttribute( colorProvider.getColor( SQLColorProvider.SQL_HC_QUOTED_LITERAL_COLOR )));
- keywordToken = new Token( new TextAttribute( colorProvider.getColor( SQLColorProvider.SQL_HC_KEYWORD_COLOR )));
- datatypeToken = new Token( new TextAttribute( colorProvider.getColor( SQLColorProvider.SQL_HC_KEYWORD_COLOR )));
- functionToken = new Token( new TextAttribute( colorProvider.getColor( SQLColorProvider.SQL_HC_KEYWORD_COLOR )));
-// identifierToken = new Token( new TextAttribute( colorProvider.getColor( SQLColorProvider.SQL_HC_IDENTIFIER_COLOR )));
- delimitedIdentifierToken = new Token( new TextAttribute( colorProvider.getColor( SQLColorProvider.SQL_HC_DELIMITED_IDENTIFIER_COLOR )));
- otherToken = new Token( new TextAttribute( colorProvider.getColor( SQLColorProvider.SQL_HC_DEFAULT_COLOR )));
- }
- else {
- commentToken = new Token( new TextAttribute( colorProvider.getColor( SQLColorProvider.SQL_COMMENT_COLOR )));
- stringToken = new Token( new TextAttribute( colorProvider.getColor( SQLColorProvider.SQL_QUOTED_LITERAL_COLOR )));
- keywordToken = new Token( new TextAttribute( colorProvider.getColor( SQLColorProvider.SQL_KEYWORD_COLOR )));
- datatypeToken = new Token( new TextAttribute( colorProvider.getColor( SQLColorProvider.SQL_KEYWORD_COLOR )));
- functionToken = new Token( new TextAttribute( colorProvider.getColor( SQLColorProvider.SQL_KEYWORD_COLOR )));
-// identifierToken = new Token( new TextAttribute( colorProvider.getColor( SQLColorProvider.SQL_IDENTIFIER_COLOR )));
- delimitedIdentifierToken = new Token( new TextAttribute( colorProvider.getColor( SQLColorProvider.SQL_DELIMITED_IDENTIFIER_COLOR )));
- otherToken = new Token( new TextAttribute( colorProvider.getColor( SQLColorProvider.SQL_DEFAULT_COLOR )));
- }
-
- setDefaultReturnToken( otherToken );
-
- List rules = new ArrayList();
-
- // Add rule for single-line comments.
- rules.add( new EndOfLineRule( "--", commentToken )); //$NON-NLS-1$
-
- // Add rules for delimited identifiers and string literals.
- rules.add( new SingleLineRule( "'", "'", stringToken, '\\' )); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- rules.add( new SingleLineRule( "\"", "\"", delimitedIdentifierToken, '\\' )); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-
- // Add generic whitespace rule.
- rules.add( new WhitespaceRule( new SQLWhiteSpaceDetector() ));
-
- // Define a word rule and add SQL keywords to it.
- WordRule wordRule = new WordRule( new SQLWordDetector(), otherToken );
- String[] reservedWords = getSQLKeywords();
- for (int i = 0; i < reservedWords.length; i++) {
- wordRule.addWord( reservedWords[i], keywordToken );
- wordRule.addWord( reservedWords[i].toLowerCase(), keywordToken );
- }
-
- // Add the SQL datatype names to the word rule.
- String[] datatypes = getSQLDatatypes();
- for (int i = 0; i < datatypes.length; i++) {
- wordRule.addWord( datatypes[i], datatypeToken );
- wordRule.addWord( datatypes[i].toLowerCase(), datatypeToken );
- }
-
- // Add the SQL function names to the word rule.
- String[] functions = getSQLFunctionNames();
- for (int i = 0; i< functions.length; i++) {
- wordRule.addWord( functions[i], functionToken );
- wordRule.addWord( functions[i].toLowerCase(), functionToken );
- }
-
- // Add the word rule to the list of rules.
- rules.add( wordRule );
-
- // Convert the list of rules to an array and return it.
- IRule[] result = new IRule[ rules.size() ];
- rules.toArray( result );
- setRules( result );
- }
-
- /**
- * Gets an array of SQL keywords (in upper case).
- *
- * @return the SQL reserved words
- */
- public static String[] getSQLKeywords() {
- return fgKeywords;
- }
-
- /**
- * Gets an array of SQL datatype names (in upper case).
- *
- * @return the SQL datatype names
- */
- public static String[] getSQLDatatypes() {
- return fgDatatypes;
- }
-
- /**
- * Gets an array of SQL built-in function names (in upper case).
- *
- * @return the SQL built-in function names
- */
- public static String[] getSQLFunctionNames() {
- return fgFunctions;
- }
-
- /**
- * Gets an array of arrays containing all SQL words, including keywords,
- * data types names, and function names (in upper case).
- *
- * @return the array of SQL words
- */
- public static Object[] getSQLAllWords() {
- return fgAllWords;
- }
-
-} // end class
diff --git a/plugins/org.eclipse.datatools.sqltools.sqleditor/src/org/eclipse/datatools/sqltools/sqleditor/internal/sql/SQLCompletionEngine.java b/plugins/org.eclipse.datatools.sqltools.sqleditor/src/org/eclipse/datatools/sqltools/sqleditor/internal/sql/SQLCompletionEngine.java
deleted file mode 100644
index 23308b0..0000000
--- a/plugins/org.eclipse.datatools.sqltools.sqleditor/src/org/eclipse/datatools/sqltools/sqleditor/internal/sql/SQLCompletionEngine.java
+++ /dev/null
@@ -1,303 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 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 is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.datatools.sqltools.sqleditor.internal.sql;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.ListIterator;
-import java.util.StringTokenizer;
-import java.util.Vector;
-
-import org.eclipse.jface.text.BadLocationException;
-import org.eclipse.jface.text.IDocument;
-import org.eclipse.jface.text.ITypedRegion;
-import org.eclipse.jface.text.contentassist.ICompletionProposal;
-import org.eclipse.swt.graphics.Image;
-
-/**
- * This class computes proposals for text completion.
- *
- * @author Hetty Dougherty
- *
- */
-public class SQLCompletionEngine implements ISQLCompletionEngine {
-
- private SQLCompletionProposalFactory fProposalFactory;
- private ISQLDBProposalsService fDBProposalsService;
-
- /**
- * Constructs an instance of this class. This is the default constructor.
- */
- public SQLCompletionEngine() {
- super();
- fProposalFactory = new SQLCompletionProposalFactory();
- fDBProposalsService = null;
- }
-
- /**
- * Computes and returns an array of text completion proposals based on the
- * given document, document region, and location in the document.
- *
- * @param doc the current document
- * @param partition a document partion region. A region consists of offset,
- * length, and type.
- * @param documentOffset the current offset in the document
- * @see ISQLCompletionEngine#computeProposals(IDocument, ITypedRegion, int,
- * IDBProposalsService)
- */
- public ICompletionProposal[] computeProposals( IDocument doc, ITypedRegion partition, int documentOffset ) {
- ICompletionProposal[] result = null;
-
- if (doc != null && partition != null && documentOffset >= 0) {
-
- List proposalList = null;
- String replacementStr = null;
- String displayStr = null;
- String sortingString = null;
- char docOffsetChar;
-
- // Get document offset to the start of "word" where content assist
- // is requested.
- int offset = getPartitionOffset( doc, partition, documentOffset, partition.getOffset() );
-
- // Sort proposals
- try {
- sortingString = doc.get( offset, documentOffset - offset );
-
- docOffsetChar = doc.getChar( documentOffset - 1 );
-
- if (docOffsetChar == '.') {
- StringTokenizer tokenizer = new StringTokenizer(sortingString, "."); //$NON-NLS-1$
- List tokenList = new ArrayList();
- while (tokenizer.hasMoreTokens()) {
- tokenList.add(tokenizer.nextToken());
- }
-
- proposalList = fProposalFactory.getDBObjectProposals( tokenList );
-
- }
- }
- catch (BadLocationException exc) {
- }
-
- Vector pList = sortProposals( proposalList, sortingString, false );
-
- result = new ICompletionProposal[pList.size()];
- int resultIdx = 0;
- for (int i = 0; i < pList.size(); i++) {
- displayStr = pList.get( i ).toString();
- replacementStr = displayStr;
- Image image = null;
- String additionalInfo = null;
- if (pList.get( i ) instanceof SQLDBProposal) {
- SQLDBProposal dbProposal = (SQLDBProposal) pList.get( i );
- String parentNameUC = dbProposal.getParentName().toUpperCase();
- String sortingStringUC = sortingString.toUpperCase();
- StringTokenizer strTokens = new StringTokenizer( parentNameUC, "." ); //$NON-NLS-1$
-
- /* For an ambiguous case where user enters "SCHEMA." and
- * there is also a table called SCHEMA then the list of proposals
- * also includes all columns in the SCHEMA.SCHEMA table.
- * If user select COL1, then we want to append SCHEMA.COL1
- * following user's input "SCHEMA."
- */
- if (strTokens.countTokens() > 1 && parentNameUC.startsWith( sortingStringUC )) {
- String preceedingNames = parentNameUC.replaceFirst( sortingStringUC, "" ); //$NON-NLS-1$
- replacementStr = preceedingNames + "." + dbProposal.toString(); //$NON-NLS-1$
- }
-
- image = ((SQLDBProposal) pList.get( i )).getImage();
- additionalInfo = ((SQLDBProposal) pList.get( i )).getParentName() + "." //$NON-NLS-1$
- + ((SQLDBProposal) pList.get( i )).getName();
- }
-
- if (pList.size() <= proposalList.size()) {
- if (replacementStr != null && documentOffset >= 0) {
- result[resultIdx] = new SQLCompletionProposal( additionalInfo, replacementStr, documentOffset,
- documentOffset, 0, image, displayStr, null );
- resultIdx++;
- }
- }
-
- }
- }
-
- return result;
- }
-
- /**
- * Returns the document offset to the start of the "word" where content
- * assist is requested.
- *
- * @param doc the current document
- * @param partition document partition region. A region consists of offset,
- * length, and type.
- * @param documentOffset offset into the document
- * @param offset offset in the document to start of the name preceeding the
- * activation character
- */
- public int getPartitionOffset( IDocument doc, ITypedRegion partition, int documentOffset, int offset ) {
- boolean loop = true;
-
- int offset1 = documentOffset - 1;
- try {
- while (loop && offset <= offset1) {
- switch (doc.getChar( offset1 )) {
- case 10: // linefeed
- case 32: // space
- case 13: // return
- case 9: { // tab
- loop = false;
- }
- break;
- default: {
- offset1--;
- }
- break;
- }
- }
- }
- catch (BadLocationException x) {
- }
-
- offset = offset1 + 1;
-
- return offset;
- }
-
- /**
- * Returns the document offset to the start of the "word" where content
- * assist is requested.
- *
- * @param doc the current document
- * @param partition document partition region. A region consists of offset,
- * length, and type.
- * @param documentOffset offset into the document
- * @param leadingString
- * @param position <code>1</code> from current position <code>0</code>
- * after leadingString
- * @return the partition offset
- */
- public int getPartitionOffset( IDocument doc, ITypedRegion partition, int documentOffset, String leadingString,
- int position ) {
- int offset = partition.getOffset() + leadingString.length();
-
- if (documentOffset <= offset)
- return offset;
-
- switch (position) {
- case 0: {
- }
- break;
- default: {
- boolean loop = true;
- int offset1 = documentOffset - 1;
- try {
- while (loop && offset <= offset1) {
- switch (doc.getChar( offset1 )) {
- case 10: // linefeed
- case 32: // space
- case 13: // return
- case 9: { // tab
- loop = false;
- }
- break;
- default: {
- offset1--;
- }
- break;
- }
- }
- }
- catch (BadLocationException x) {
- }
- ;
-
- offset = offset1 + 1;
- }
- break;
- }
-
- return getPartitionOffset( doc, partition, documentOffset, offset );
- }
-
- /**
- * Sorts the given list of proposals.
- *
- * @param proposals list of proposals to be sorted
- * @param sortingString string to be used as sorting "seed"
- * @param showAll
- * @return the sorted list of proposals
- */
- public Vector sortProposals( List proposals, String sortingString, boolean showAll ) {
-
- Vector aList = new Vector();
- if (proposals == null)
- return aList;
-
- if (sortingString != null && sortingString.length() > 0) {
- char triggerChar = sortingString.charAt( sortingString.length() - 1 );
- String precedingName = null;
- if (triggerChar == '.') {
- precedingName = sortingString.substring( 0, sortingString.length() - 1 );
- if (!precedingName.equals( "" )) { //$NON-NLS-1$
-
- ListIterator listIterator = proposals.listIterator();
- while (listIterator.hasNext()) {
- Object proposal = listIterator.next();
- if (proposal instanceof SQLDBProposal) {
- String parentNameUC = ((SQLDBProposal) proposal).getParentName().toUpperCase();
- String precedingNameUC = precedingName.toUpperCase();
- if (parentNameUC.endsWith( precedingNameUC )) {
- aList.add( proposal );
- }
- }
- }
- }
- }
- else {
- for (int i = 0; i < proposals.size(); i++) {
- if (!(proposals.get( i ) instanceof SQLDBProposal)) {
- if (proposals.get( i ).toString().toUpperCase().trim().indexOf( sortingString.toUpperCase() ) != 0)
- continue;
- aList.add( proposals.get( i ) );
- }
- }
- }
- }
-
- if (showAll && aList.size() == 0) {
- aList.addAll( proposals );
- }
-
- return aList;
- }
-
- /**
- * Sets the <code>DBProposalsService</code> to use.
- *
- * @param dbProposalsService the <code>DBProposalsService</code> to use
- */
- public void setDBProposalsService( ISQLDBProposalsService dbProposalsService ) {
- fDBProposalsService = dbProposalsService;
- fProposalFactory.setFactoryDBContext( dbProposalsService );
- }
-
- /**
- * Gets the current <code>DBProposalsService</code>.
- *
- * @param dbProposalsService the current <code>DBProposalsService</code>.
- */
- public ISQLDBProposalsService getDBProposalsService() {
- return fDBProposalsService;
- }
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.datatools.sqltools.sqleditor/src/org/eclipse/datatools/sqltools/sqleditor/internal/sql/SQLCompletionProcessor.java b/plugins/org.eclipse.datatools.sqltools.sqleditor/src/org/eclipse/datatools/sqltools/sqleditor/internal/sql/SQLCompletionProcessor.java
deleted file mode 100644
index a6f0ac5..0000000
--- a/plugins/org.eclipse.datatools.sqltools.sqleditor/src/org/eclipse/datatools/sqltools/sqleditor/internal/sql/SQLCompletionProcessor.java
+++ /dev/null
@@ -1,238 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 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 is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.datatools.sqltools.sqleditor.internal.sql;
-
-import java.util.Arrays;
-import java.util.Comparator;
-
-import org.eclipse.jface.text.BadLocationException;
-import org.eclipse.jface.text.IDocument;
-import org.eclipse.jface.text.ITextViewer;
-import org.eclipse.jface.text.ITypedRegion;
-import org.eclipse.jface.text.TextPresentation;
-import org.eclipse.jface.text.contentassist.ICompletionProposal;
-import org.eclipse.jface.text.contentassist.IContentAssistProcessor;
-import org.eclipse.jface.text.contentassist.IContextInformation;
-import org.eclipse.jface.text.contentassist.IContextInformationPresenter;
-import org.eclipse.jface.text.contentassist.IContextInformationValidator;
-
-/**
- * This class implements a content assist processor for SQL code.
- * <p>
- * This processor should be registered with a content assistant in order to get
- * involved in the assisting process.
- *
- * @author Hetty Dougherty
- *
- */
-public class SQLCompletionProcessor implements IContentAssistProcessor {
-
- private char[] fProposalAutoActivationSet;
-
- /**
- * Simple content assist tip closer. The tip is valid in a range of 5
- * characters around its popup location.
- */
- protected static class Validator implements IContextInformationValidator, IContextInformationPresenter {
- protected int fInstallOffset;
-
- /**
- * @see IContextInformationValidator#isContextInformationValid(int)
- */
- public boolean isContextInformationValid( int offset ) {
- return Math.abs( fInstallOffset - offset ) < 5;
- }
-
- /**
- * @see IContextInformationValidator#install(IContextInformation,
- * ITextViewer, int)
- */
- public void install( IContextInformation info, ITextViewer viewer, int offset ) {
- fInstallOffset = offset;
- }
-
- public boolean updatePresentation( int position, TextPresentation presentation ) {
- return true;
- }
- };
-
- private static class CompletionProposalComparator implements Comparator {
- public int compare( Object o1, Object o2 ) {
- ICompletionProposal c1 = (ICompletionProposal) o1;
- ICompletionProposal c2 = (ICompletionProposal) o2;
- return c1.getDisplayString().compareTo( c2.getDisplayString() );
- }
- };
-
- protected IContextInformationValidator fValidator = new Validator();
-
- private ISQLCompletionEngine fCompletionEngine;
- private Comparator fComparator;
- private ISQLDBProposalsService fDBProposalsService;
-
- public SQLCompletionProcessor() {
- super();
-
- // activation/trigger to invoke content assist
- char[] completionChars = { '.' };
- setCompletionProposalAutoActivationCharacters( completionChars );
-
- fCompletionEngine = new SQLCompletionEngine();
- fComparator = new CompletionProposalComparator();
- fDBProposalsService = null;
- }
-
- /**
- * Tells this processor to order the proposals alphabetically.
- *
- * @param order <code>true</code> if proposals should be ordered.
- */
- public void orderProposalsAlphabetically( boolean order ) {
- fComparator = order ? new CompletionProposalComparator() : null;
- }
-
- /**
- * Returns a list of proposed content completions based on the specified
- * location within the document that corresponds to the current cursor
- * position within the text-editor control.
- *
- * @param viewer the viewer whose document is used to compute the proposals
- * @param documentPosition a location within the document
- * @return an array of content-assist proposals
- */
- public ICompletionProposal[] computeCompletionProposals( ITextViewer viewer, int documentOffset ) {
- ICompletionProposal[] result = null;
-
- try {
- IDocument doc = viewer.getDocument();
- ITypedRegion partition = null;
-
- if (documentOffset > 0) {
- if (doc.getChar( documentOffset - 1 ) == ';')
- partition = viewer.getDocument().getPartition( documentOffset );
- else
- // for incomplete statement.
- partition = viewer.getDocument().getPartition( documentOffset - 1 );
- }
- else
- partition = viewer.getDocument().getPartition( documentOffset );
-
- result = fCompletionEngine.computeProposals( doc, partition, documentOffset );
- }
- catch (BadLocationException x) {
- }
- ;
-
- if (result != null)
- result = order( result );
-
- return result;
- }
-
- /**
- * Returns a list of content-assist tips based on the specified location
- * within the document that corresponds to the current cursor position
- * within the text-editor control.
- *
- * @param viewer the viewer whose document is used to compute the tips
- * @param documentPosition a location within the document
- * @return an array of content-assist tips
- */
-
- public IContextInformation[] computeContextInformation( ITextViewer viewer, int documentOffset ) {
- IContextInformation[] result = null;
- return result;
- }
-
- /**
- * Returns a string of characters which when pressed should automatically
- * display content-assist proposals.
- *
- * @see IContentAssistProcessor.getCompletionProposalAutoActivationCharacters()
- *
- * @return string of characters
- */
- public char[] getCompletionProposalAutoActivationCharacters() {
- return fProposalAutoActivationSet;
- }
-
- /**
- * Returns a string of characters which when pressed should automatically
- * display a content-assist tip.
- *
- * @return string of characters
- */
- public char[] getContextInformationAutoActivationCharacters() {
- return new char[] { '#' };
- }
-
- /**
- * Returns a delegate used to determine when a displayed tip should be
- * dismissed.
- *
- * @return a tip closer
- */
- public IContextInformationValidator getContextInformationValidator() {
- return fValidator;
- }
-
- /**
- * Gets the DBProposalsService.
- *
- * @return the DBProposalsService
- */
- public ISQLDBProposalsService getDBProposalService() {
- return fDBProposalsService;
- }
-
- /**
- * Returns the reason why the content-assist processor was unable to produce
- * any proposals or tips.
- *
- * @return an error message or null if no error occurred
- */
- public String getErrorMessage() {
- return null;
- }
-
- /**
- * Sets the <code>ISQLDBProposalsService</code> to use to generate DB object
- * proposals (tables, columns) for content assist.
- *
- * @param dbProposalsService the <code>ISQLDBProposalsService</code> object to use
- */
- public void setDBProposalsService( ISQLDBProposalsService dbProposalsService ) {
- fDBProposalsService = dbProposalsService;
- ((SQLCompletionEngine) fCompletionEngine).setDBProposalsService( fDBProposalsService );
- }
-
- /**
- * Orders the given proposals.
- *
- * @params ICompletionProposal[] List of proposals to be ordered
- */
- private ICompletionProposal[] order( ICompletionProposal[] proposals ) {
- if (fComparator != null)
- Arrays.sort( proposals, fComparator );
- return proposals;
- }
-
- /**
- * Sets this processor's set of characters triggering the activation of the
- * completion proposal computation.
- *
- * @param activationSet the activation set
- */
- public void setCompletionProposalAutoActivationCharacters( char[] activationSet ) {
- fProposalAutoActivationSet = activationSet;
- }
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.datatools.sqltools.sqleditor/src/org/eclipse/datatools/sqltools/sqleditor/internal/sql/SQLCompletionProposal.java b/plugins/org.eclipse.datatools.sqltools.sqleditor/src/org/eclipse/datatools/sqltools/sqleditor/internal/sql/SQLCompletionProposal.java
deleted file mode 100644
index 87f4cfd..0000000
--- a/plugins/org.eclipse.datatools.sqltools.sqleditor/src/org/eclipse/datatools/sqltools/sqleditor/internal/sql/SQLCompletionProposal.java
+++ /dev/null
@@ -1,346 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 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 is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.datatools.sqltools.sqleditor.internal.sql;
-
-import org.eclipse.jface.text.BadLocationException;
-import org.eclipse.jface.text.IDocument;
-import org.eclipse.jface.text.contentassist.ICompletionProposal;
-import org.eclipse.jface.text.contentassist.ICompletionProposalExtension;
-import org.eclipse.jface.text.contentassist.IContextInformation;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.graphics.Point;
-
-/**
- *
- * This class represents a completion proposal generated by content assist
- * processor. The completion proposal contains information used to present the
- * proposed completion to the user, to insert the completion should the user
- * select it, and to present context information for the chosen completion once
- * it has been inserted.
- *
- * @author Hetty Dougherty
- *
- */
-public class SQLCompletionProposal implements ICompletionProposal, ICompletionProposalExtension {
-
- private String fDisplayString;
- private String fReplacementString;
- private int fReplacementOffset;
- private int fDocumentOffset = -1;
- private int fReplacementLength;
- private int fCursorPosition;
- private Image fImage;
- private IContextInformation fContextInformation;
- private int fContextInformationPosition;
- private char[] fTriggerCharacters;
- private String fAdditionalProposalInfo;
-
- /**
- * Creates a new completion proposal. All fields are initialized based on
- * the provided information.
- *
- * @param additionalInfo additional information about the completion proposal
- * @param replacementString the actual string to be inserted into the document
- * @param replacementOffset offset of the text to be replaced
- * @param documentOffset offset of the document
- * @param replacementLength length of the text to be replaced
- * @param image the image to display for this proposal
- * @param displayString the string to be displayed for the proposal If set
- * to <code>null</code>, the replacement string will be taken
- * as display string.
- */
- public SQLCompletionProposal( String additionalInfo, String replacementString, int replacementOffset,
- int documentOffset, int replacementLength, Image image, String displayString,
- IContextInformation contextInformation ) {
-
- fReplacementString = replacementString;
- fReplacementOffset = replacementOffset;
- fDocumentOffset = documentOffset;
- fReplacementLength = replacementLength;
- fImage = image;
- fDisplayString = displayString != null ? displayString : replacementString;
-
- fCursorPosition = replacementString.length();
-
- fContextInformation = contextInformation;
-
- fTriggerCharacters = null;
- fAdditionalProposalInfo = additionalInfo;
- }
-
- /**
- * Creates a new completion proposal. All fields are initialized based on
- * the provided information.
- *
- * @param replacementString the actual string to be inserted into the document
- * @param replacementOffset the offset of the text to be replaced
- * @param replacementLength the length of the text to be replaced
- * @param cursorPosition the position of the cursor following the insert
- * relative to replacementOffset
- * @param image the image to display for this proposal
- * @param displayString the string to be displayed for the proposal
- * @param contentInformation the context information associated with this proposal
- * @param additionalProposalInfo the additional information associated with
- * this proposal
- */
- public SQLCompletionProposal( String replacementString, int replacementOffset, int replacementLength,
- int cursorPosition, Image image, String displayString, IContextInformation contextInformation,
- String additionalProposalInfo ) {
-
- fReplacementString = replacementString;
- fReplacementOffset = replacementOffset;
- fDocumentOffset = fReplacementOffset;
- fReplacementLength = replacementLength;
- fCursorPosition = cursorPosition;
- fImage = image;
- fDisplayString = displayString;
- fContextInformation = contextInformation;
- fAdditionalProposalInfo = additionalProposalInfo;
-
- }
-
- /**
- * Sets the context information.
- *
- * @param contentInformation The context information associated with this
- * proposal
- */
- public void setContextInformation( IContextInformation contextInformation ) {
- fContextInformation = contextInformation;
- fContextInformationPosition = (fContextInformation != null ? fCursorPosition : -1);
- }
-
- /**
- * Sets the trigger characters.
- *
- * @param triggerCharacters The set of characters which can trigger the
- * application of this completion proposal
- */
- public void setTriggerCharacters( char[] triggerCharacters ) {
- fTriggerCharacters = triggerCharacters;
- }
-
- /**
- * Sets the cursor position relative to the insertion offset. By default
- * this is the length of the completion string (Cursor positioned after the
- * completion)
- *
- * @param cursorPosition The cursorPosition to set
- */
- public void setCursorPosition( int cursorPosition ) {
-
- if (cursorPosition >= 0) {
- fCursorPosition = cursorPosition;
- fContextInformationPosition = (fContextInformation != null ? fCursorPosition : -1);
- }
- }
-
- /*
- * @see ICompletionProposalExtension#apply(IDocument, char, int)
- */
- public void apply( IDocument document, char trigger, int offset ) {
- try {
- // patch replacement length
-
- int delta = offset - (fDocumentOffset + fReplacementLength);
- if (delta > 0)
- fReplacementLength += delta;
-
- if (trigger == (char) 0) {
- replace( document, fDocumentOffset, fReplacementLength, fReplacementString );
- }
- else {
- StringBuffer buffer = new StringBuffer( fReplacementString );
-
- if ((fReplacementLength < buffer.length() && buffer.charAt( fReplacementLength ) != trigger)) {
- buffer.insert( fCursorPosition, trigger );
- ++fCursorPosition;
- }
-
- replace( document, fDocumentOffset, fReplacementLength, buffer.toString() );
- }
-
- int oldLen = document.getLength();
- fDocumentOffset += document.getLength() - oldLen;
- }
- catch (BadLocationException x) {
- //Hetty
- x.printStackTrace();
- }
- }
-
- /**
- * Replaces the document content at the specified offset and length with the
- * specified string.
- *
- * @param document the document opened in the editor
- * @param offset offset to the document content to be replaced
- * @param length length of text to be replaced
- * @param string replacement string
- * @throws BadLocationException
- */
- private void replace( IDocument document, int offset, int length, String string ) throws BadLocationException {
- if (document != null && string != null && offset >= 0 && length >= 0) {
- if (!document.get( offset, length ).equals( string ))
- document.replace( offset, length, string );
- }
- }
-
- /*
- * @see ICompletionProposal#apply
- */
- public void apply( IDocument document ) {
-
- apply( document, (char) 0, fDocumentOffset + fReplacementLength );
- }
-
- /*
- * @see ICompletionProposal#getSelection
- */
- public Point getSelection( IDocument document ) {
-
- return new Point( fDocumentOffset + fCursorPosition, 0 );
- }
-
- /*
- * @see ICompletionProposal#getContextInformation()
- */
- public IContextInformation getContextInformation() {
- return fContextInformation;
- }
-
- /*
- * @see ICompletionProposal#getImage()
- */
- public Image getImage() {
- return fImage;
- }
-
- /*
- * @see ICompletionProposal#getDisplayString()
- */
- public String getDisplayString() {
- return fDisplayString;
- }
-
- /*
- * @see ICompletionProposal#getAdditionalProposalInfo()
- */
- public String getAdditionalProposalInfo() {
- return fAdditionalProposalInfo;
- }
-
- /*
- * @see ICompletionProposalExtension#getTriggerCharacters()
- */
- public char[] getTriggerCharacters() {
- return fTriggerCharacters;
- }
-
- /*
- * @see ICompletionProposalExtension#getContextInformationPosition()
- */
- public int getContextInformationPosition() {
- return fReplacementOffset + fContextInformationPosition;
- }
-
- /**
- * Gets the replacement offset.
- *
- * @return the replacement offset
- */
- public int getReplacementOffset() {
- return fReplacementOffset;
- }
-
- /**
- * Sets the replacement offset.
- *
- * @param replacementOffset the replacement offset to set
- */
- public void setReplacementOffset( int replacementOffset ) {
-
- if (replacementOffset >= 0) {
- fReplacementOffset = replacementOffset;
- }
- }
-
- /**
- * Gets the replacement length.
- *
- * @return the replacement length
- */
- public int getReplacementLength() {
- return fReplacementLength;
- }
-
- /**
- * Sets the replacement length.
- *
- * @param replacementLength the replacement length to set
- */
- public void setReplacementLength( int replacementLength ) {
-
- if (replacementLength >= 0) {
- fReplacementLength = replacementLength;
- }
- }
-
- /**
- * Gets the replacement string.
- *
- * @return the replacement string
- */
- public String getReplacementString() {
- return fReplacementString;
- }
-
- /**
- * Sets the replacement string.
- *
- * @param replacementString the replacement string to set
- */
- public void setReplacementString( String replacementString ) {
- fReplacementString = replacementString;
- }
-
- /**
- * Sets the image.
- *
- * @param image the image to set
- */
- public void setImage( Image image ) {
- fImage = image;
- }
-
- /*
- * @see ICompletionProposalExtension#isValidFor(IDocument, int)
- */
- public boolean isValidFor( IDocument document, int offset ) {
- if (offset < fReplacementOffset)
- return false;
-
- int replacementLength = fReplacementString == null ? 0 : fReplacementString.length();
- if (offset >= fReplacementOffset + replacementLength)
- return false;
-
- try {
- int length = offset - fReplacementOffset;
- String start = document.get( fReplacementOffset, length );
- return fReplacementString.substring( 0, length ).equalsIgnoreCase( start );
- }
- catch (BadLocationException x) {
- }
-
- return false;
- }
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.datatools.sqltools.sqleditor/src/org/eclipse/datatools/sqltools/sqleditor/internal/sql/SQLCompletionProposalFactory.java b/plugins/org.eclipse.datatools.sqltools.sqleditor/src/org/eclipse/datatools/sqltools/sqleditor/internal/sql/SQLCompletionProposalFactory.java
deleted file mode 100644
index 1866cf4..0000000
--- a/plugins/org.eclipse.datatools.sqltools.sqleditor/src/org/eclipse/datatools/sqltools/sqleditor/internal/sql/SQLCompletionProposalFactory.java
+++ /dev/null
@@ -1,86 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 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 is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: IBM Corporation - initial API and implementation
- ******************************************************************************/
-
-package org.eclipse.datatools.sqltools.sqleditor.internal.sql;
-
-import java.util.ArrayList;
-import java.util.List;
-
-public final class SQLCompletionProposalFactory {
-
- private final static String[] fStatements = {};
- private final static String[] fContextInformation = {};
- private ArrayList fDBProposalList = new ArrayList();
- private ISQLDBProposalsService fDBProposalsService;
-
- /**
- * Constructs an instance of this class. This is the default constructor.
- */
- public SQLCompletionProposalFactory() {
- super();
- }
-
- /**
- * Gets proposals based on SQL statement type. This is to be implemented in
- * the future if we want to provide proposals based on statement type. For
- * example valid keywords for SELECT statement
- *
- * @return array of proposals based on statement type
- */
- public String[] getStatementProposals() {
- return fStatements;
- }
-
- /**
- * Gets context information as an array of strings.
- *
- * @return the context information array
- */
- public String[] getContextInformation() {
- return fContextInformation;
- }
-
- /**
- * Gets a list of <code>DBProposal</code> objects.
- *
- * @param tokenList list of tokens entered by user to invoke the content assist. For example if user
- * entered schema1.table1 then the ArrayList consists of 2 tokens schema1, and table1.
- * @return the list of <code>DBProposal</code> objects
- */
- public List getDBObjectProposals( List tokenList ) {
-
- fDBProposalList.clear();
- if (fDBProposalsService != null) {
- // Load DB proposals
- if (fDBProposalsService.populate( tokenList )) {
- fDBProposalList.addAll(fDBProposalsService.getDBProposals());
- }
- }
-
- return fDBProposalList;
- }
-
- /**
- * Sets the <code>DBProposalsService</code> to use.
- *
- * @param dbProposalsService the <code>DBProposalsService</code> to use
- */
- public void setFactoryDBContext( ISQLDBProposalsService dbProposalsService ) {
- fDBProposalsService = dbProposalsService;
- }
-
- /**
- * Get the <code>DBProposalsService</code> to use.
- *
- * @return IDBProposalsService the <code>DBProposalsService</code> to use
- */
- public ISQLDBProposalsService getDBProposalsService( ) {
- return fDBProposalsService;
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.datatools.sqltools.sqleditor/src/org/eclipse/datatools/sqltools/sqleditor/internal/sql/SQLDBProposal.java b/plugins/org.eclipse.datatools.sqltools.sqleditor/src/org/eclipse/datatools/sqltools/sqleditor/internal/sql/SQLDBProposal.java
deleted file mode 100644
index a812091..0000000
--- a/plugins/org.eclipse.datatools.sqltools.sqleditor/src/org/eclipse/datatools/sqltools/sqleditor/internal/sql/SQLDBProposal.java
+++ /dev/null
@@ -1,166 +0,0 @@
-/*
-* Copyright (c) 2005. 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
-* http://www.eclipse.org/legal/epl-v10.html
-*
-* Contributors:
-* IBM Corporation - initial API and implementation
-*/
-
-package org.eclipse.datatools.sqltools.sqleditor.internal.sql;
-
-import org.eclipse.datatools.modelbase.sql.schema.Schema;
-import org.eclipse.datatools.modelbase.sql.tables.Column;
-import org.eclipse.datatools.modelbase.sql.tables.Table;
-import org.eclipse.datatools.sqltools.sqleditor.internal.SQLEditorResources;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.swt.graphics.Image;
-
-/**
- * Content assist proposal that represents either a schema, table, or column.
- *
- * @author Hetty Dougherty
- *
- */
-public class SQLDBProposal {
-
- public static final int SCHEMA_OBJTYPE = 1; //proposal is a schema
- public static final int TABLE_OBJTYPE = 2; // proposal is a table
- public static final int TABLECOLUMN_OBJTYPE = 3; //proposal is table column
- public static final int UNKNOWN_OBJTYPE = -1;
-
- private EObject fDBObject; // database model object
- private Image fImage = null;
- private String fName = null;
- private String fParentName = null;
- private EObject fParentObject; //parent of the database model object
- private int fType = UNKNOWN_OBJTYPE;
-
- /**
- * Constructs an instance of this object to represent the given database
- * model object for purpose of a content assist proposal.
- * The database object can be one of <code>Schema</code>, <code>Table</code>,
- * <code>Column</code>.
- *
- * @param dbObject
- * the database model object
- * @see org.eclipse.datatools.modelbase.sql.schema.Schema
- * @see org.eclipse.datatools.modelbase.sql.schema.Table
- * @see org.eclipse.datatools.modelbase.sql.schema.Column
- */
- public SQLDBProposal( EObject dbObject ) {
- this.fDBObject = dbObject;
- if (dbObject instanceof Schema) {
- fType = SCHEMA_OBJTYPE;
- fName = ((Schema) dbObject).getName();
- fParentName = ((Schema) dbObject).getDatabase().getName();
- fParentObject = ((Schema) dbObject).getDatabase();
- setImage( SQLEditorResources.getImage( "schema" )); //$NON-NLS-1$
- }
- else if (dbObject instanceof Table) {
- fType = TABLE_OBJTYPE;
- fName = ((Table) dbObject).getName();
- fParentName = ((Table) dbObject).getSchema().getName();
- fParentObject = ((Table) dbObject).getSchema();
- setImage( SQLEditorResources.getImage( "table" )); //$NON-NLS-1$
- }
- else if (dbObject instanceof Column) {
- fType = TABLECOLUMN_OBJTYPE;
- fName = ((Column) dbObject).getName();
- fParentName = ((Column) dbObject).getTable().getSchema().getName()
- + "." + ((Column) dbObject).getTable().getName();
-
- fParentObject = ((Column) dbObject).getTable();
- setImage( SQLEditorResources.getImage( "column" )); //$NON-NLS-1$
- }
- }
-
- /**
- * Gets the database model object that this proposal represents.
- *
- * @return the database model object
- */
- public EObject getDBObject() {
- return fDBObject;
- }
-
- /**
- * Gets the image to be used for this content assist proposal.
- *
- * @return the image for this model object type
- */
- public Image getImage() {
- return fImage;
- }
-
- /**
- * Gets the name of the database object.
- *
- * @return the name of the database object
- */
- public String getName() {
- return fName;
- }
-
- /**
- * Gets the name of the parent of the database model object associated
- * with this proposal.
- *
- * @return the parent name
- */
- public String getParentName() {
- return fParentName;
- }
-
- /**
- * Gets the parent of the database object.
- *
- * @return the parent of the database object
- */
- public EObject getParentObject() {
- return fParentObject;
- }
-
- /**
- * Gets the type of the proposal.
- *
- * @return type of proposal, which is one of
- * <ol>
- * <li>SCHEMA_OBJTYPE
- * <li>TABLE_OBJTYPE
- * <li>TABLECOLUMN_OBJTYPE <eol>
- */
- public int getType() {
- return fType;
- }
-
- /**
- * Sets the image to be used for this content assist proposal.
- *
- * @param image the <code>Image</code> to use for this proposal
- */
- public void setImage( Image image ) {
- fImage = image;
- }
-
- /**
- * Sets the parent name to the given name.
- *
- * @param parentName the parent name to set
- */
- public void setParentName( String parentName ) {
- fParentName = parentName;
- }
-
- /**
- * Gets a string describing this object. The name attribute of this object
- * is returned.
- *
- * @return the string describing this object.
- */
- public String toString() {
- return fName;
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.datatools.sqltools.sqleditor/src/org/eclipse/datatools/sqltools/sqleditor/internal/sql/SQLDBProposalsService.java b/plugins/org.eclipse.datatools.sqltools.sqleditor/src/org/eclipse/datatools/sqltools/sqleditor/internal/sql/SQLDBProposalsService.java
deleted file mode 100644
index d3acfa3..0000000
--- a/plugins/org.eclipse.datatools.sqltools.sqleditor/src/org/eclipse/datatools/sqltools/sqleditor/internal/sql/SQLDBProposalsService.java
+++ /dev/null
@@ -1,356 +0,0 @@
-/*
-* Copyright (c) 2005. 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
-* http://www.eclipse.org/legal/epl-v10.html
-*
-* Contributors:
-* IBM Corporation - initial API and implementation
-*/
-
-package org.eclipse.datatools.sqltools.sqleditor.internal.sql;
-
-import java.lang.reflect.InvocationTargetException;
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.datatools.connectivity.internal.core.connection.ConnectionInfo;
-import org.eclipse.datatools.modelbase.sql.schema.Database;
-import org.eclipse.datatools.modelbase.sql.schema.Schema;
-import org.eclipse.datatools.modelbase.sql.tables.Column;
-import org.eclipse.datatools.modelbase.sql.tables.Table;
-import org.eclipse.datatools.sqltools.sqleditor.internal.utils.SQLDBUtils;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.jface.operation.IRunnableWithProgress;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.progress.IProgressService;
-
-/**
- * Provides database identifier proposal services for the editor, to support code
- * completion. These are services to construct and return a list of proposals of
- * database objects (tables, columns) based on a given database connection.
- *
- * This class implements the <code>ISQLDBProposalsService</code> interface.
- *
- * @author Hetty Dougherty
- * @author bgp
- */
-public class SQLDBProposalsService implements ISQLDBProposalsService {
-
- protected static int PROPOSAL_TYPE_INVALID = -1;
- protected static int PROPOSAL_TYPE_TABLES = 1;
- protected static int PROPOSAL_TYPE_COLUMNS = 2;
-
- private ConnectionInfo fConnInfo;
- private String fDBName;
- private List fDBProposalList;
- private String fImpliedSchemaName;
- private List fTokenList;
-
- /**
- * Constructs an instance of this class with the given
- * <code>ConnectionInfo</code> object.
- *
- * @param connInfo the <code>ConnectionInfo</code> object to use
- */
- public SQLDBProposalsService( ConnectionInfo connInfo ) {
- this( connInfo, null );
- }
-
- /**
- * Constructs an instance of this class with the given
- * <code>ConnectionInfo</code> object and default (implied) schema name.
- *
- * @param connInfo the <code>ConnectionInfo</code> object to use
- * @param schemaName the default (implied) schema name
- */
- public SQLDBProposalsService( ConnectionInfo connInfo , String schemaName) {
- super();
-
- fConnInfo = connInfo;
- fDBName = fConnInfo.getDatabaseName();
- fDBProposalList = new ArrayList();
- fImpliedSchemaName = schemaName;
- fTokenList = null;
- }
-
- /**
- * Returns a value indicating whether tables only, columns only, or both
- * tables and columns are needed for the proposal list by examining the
- * given list of tokens indicating the start of the expression for which
- * DB proposals are wanted. The returned value contains the constants
- * PROPOSAL_TYPE_TABLES and PROPOSAL_TYPE_COLUMNS either alone or "ORed"
- * together, or PROPOSAL_TYPE_INVALID.
- *
- * @param tokenList list of tokens indicating the start of the expression for
- * which the user wants DB proposals
- * @return
- */
- protected int determineProposalType( List tokenList ) {
- int proposalType = PROPOSAL_TYPE_INVALID;
- if (tokenList.size() == 1) {
- if (fImpliedSchemaName == null) {
- proposalType = SQLDBProposalsService.PROPOSAL_TYPE_TABLES;
- } else {
- proposalType = SQLDBProposalsService.PROPOSAL_TYPE_TABLES | SQLDBProposalsService.PROPOSAL_TYPE_COLUMNS;
- }
- } else if (tokenList.size() == 2) {
- proposalType = SQLDBProposalsService.PROPOSAL_TYPE_COLUMNS;
- }
-
- return proposalType;
- }
-
-
- /**
- * Gets the <code>ConnectionInfo</code> used to provide content assist.
- * Implements <code>ISQLDBProposalsService</code> interface.
- *
- * @return the current <code>ConnectionInfo</code> object
- * @see ISQLDBProposalsService#getConnectionInfo()
- */
- public ConnectionInfo getConnectionInfo() {
- return fConnInfo;
- }
-
- /**
- * Gets the current database name.
- * Implements <code>ISQLDBProposalsService</code> interface.
- *
- * @return the database name
- * @see ISQLDBProposalsService#getDatabaseName()
- */
- public String getDatabaseName() {
- return fDBName;
- }
-
- /**
- * Gets the list of <code>SQLDBProposal</code> objects for the content assist proposals.
- * Implements <code>ISQLDBProposalsService</code> interface.
- *
- * @return the list of proposals
- * @see ISQLDBProposalsService#getDBProposals()
- */
- public List getDBProposals() {
- return fDBProposalList;
- }
-
- /**
- * Gets a <code>Schema</code> object with the given name from the given the
- * database.
- *
- * @param database the database to search for the named schema
- * @param schemaName the name of the schema to find
- * @return the <code>Schema</code> object with the given name
- */
- protected Schema getSchema( Database database, String schemaName) {
- EList schemaList = database.getSchemas();
- Schema schema = null;
- for (int i = 0; i < schemaList.size(); i++) {
- Schema thisSchema = (Schema)schemaList.get(i);
- if (thisSchema.getName().equalsIgnoreCase( schemaName )) {
- schema = thisSchema;
- break;
- }
- }
- return schema;
- }
-
- /**
- * Gets the default (implied) schema name.
- * Implements <code>ISQLDBProposalsService</code> interface.
- *
- * @return the default (implied) schema name
- * @see ISQLDBProposalsService#getSchemaName()
- */
- public String getSchemaName() {
- return fImpliedSchemaName;
- }
-
- /**
- * Gets the current token list. The token list is a of strings indicating the start of the expression for
- * which the user wants DB proposals
- *
- * @return the token list
- */
- public List getTokenList() {
- return fTokenList;
- }
-
- /**
- * Creates and stores a list of <code>SQLDBProposal</code> objects for each
- * column in the given table. Retrieve the list using getDBProposals().
- * The current list of proposals, if any, is cleared.
- *
- * @param table the <code>Table</code> object for which columns are needed
- */
- protected void loadColumns( Table table ) {
- loadColumns( table, true );
- }
-
- /**
- * Creates and stores a list of <code>SQLDBProposal</code> objects for each
- * column in the given table. Retrieve the list using getDBProposals().
- *
- * @param table the <code>Table</code> object for which columns are needed
- * @param clear when true, clear the existing list of proposals before loading
- */
- protected void loadColumns( Table table, boolean clear ) {
- if (table != null) {
- if (clear) {
- fDBProposalList.clear();
- }
-
- EList columns = table.getColumns();
- for (int j = 0; j < columns.size(); j++) {
- Column column = (Column) columns.get( j );
- fDBProposalList.add( new SQLDBProposal( column ) );
- }
- }
- }
-
- /**
- * Creates and stores a list of <code>SQLDBProposal</code> objects for the available
- * schemas, tables, and columns of the currently connected database. Retrieve the
- * list using getDBProposals(). The current list of proposals, if any, is cleared.
- *
- * @param tokenList list of strings indicating the start of the expression for
- * which the user wants DB proposals
- */
- protected void loadDBProposals( List tokenList ) {
- Database db = fConnInfo.getSharedDatabase();
-
- fDBProposalList.clear();
- if (db != null) {
- int proposalsType = determineProposalType( tokenList );
-
- Schema schema = getSchema(db, (String) tokenList.get(0));
- if ((proposalsType & SQLDBProposalsService.PROPOSAL_TYPE_TABLES) == SQLDBProposalsService.PROPOSAL_TYPE_TABLES) {
- loadTables( schema, false );
- }
-
- if ((proposalsType & SQLDBProposalsService.PROPOSAL_TYPE_COLUMNS) == SQLDBProposalsService.PROPOSAL_TYPE_COLUMNS) {
- String tableToken = null;
- if (tokenList.size() == 1 && fImpliedSchemaName != null) {
- schema = getSchema( db, fImpliedSchemaName );
- tableToken = (String)tokenList.get(0);
- } else if (tokenList.size() >= 0) {
- tableToken = (String)tokenList.get(1);
- }
-
- if (tableToken != null && tableToken.trim().length() > 0) {
- Table table = null;
- EList tables = schema.getTables();
- for (int i = 0; i < tables.size() ; i++) {
- table = (Table)tables.get(i);
- loadColumns( table, false );
- }
- }
- }
- }
- }
-
- /**
- * Creates and stores a list of <code>SQLDBProposal</code> objects for each
- * table associated with the given schema. Retrieve the list using getDBProposals().
- * The current list of proposals, if any, is cleared.
- *
- * @param schema the <code>Schema</code> object for which tables are needed
- */
- protected void loadTables( Schema schema ) {
- loadTables( schema, true );
- }
-
- /**
- * Creates and stores a list of <code>SQLDBProposal</code> objects for each
- * table associated with the given schema. Retrieve the list using getDBProposals().
- *
- * @param schema the <code>Schema</code> object for which tables are needed
- * @param clear when true, clear the existing list of proposals before loading
- */
- protected void loadTables( Schema schema, boolean clear ) {
- if (schema != null) {
- if (clear){
- fDBProposalList.clear();
- }
- EList tables = schema.getTables();
-
- for (int i = 0; i < tables.size(); i++) {
- Table table = (Table) tables.get( i );
- fDBProposalList.add( new SQLDBProposal( table ) );
- }
- }
- }
-
-
- /**
- * Populates the list database of database object proposals (schemas, tables,
- * columns) using given list of tokens (DB identifiers) indicating the start of
- * the expression for which the user wants DB proposals. For example, if the
- * user provides the list (MYSCHEMA, TABLE1), the list of proposals will be the
- * columns of table MYSCHEMA.TABLE1. Retrieve the list using getDBProposals().
- * Implements <code>ISQLDBProposalsService</code> interface.
- *
- * @param tokenList list of strings indicating the start of the expression for
- * which the user wants DB proposals
- * @return true if database objects were loaded, for example
- * as a result of reestablishing a connection
- * @see ISQLDBProposalsService#populate()
- */
- public boolean populate( List tokenList ) {
- boolean loaded = false;
-
- /* If there isn't a context for the DB proposals, don't do anything. */
- if (tokenList.size() > 0) {
- /* Connect or reconnect to DB Server if necessary. */
- ConnectionInfo connInfo = getConnectionInfo();
- boolean connected = SQLDBUtils.reestablishConnection( connInfo );
- if (connected == true) {
- loaded = true;
-
- /* Get the proposals from the connected database. */
- fTokenList = tokenList;
- try {
- IProgressService progressService = PlatformUI.getWorkbench().getProgressService();
- progressService.runInUI(
- PlatformUI.getWorkbench().getProgressService(),
- new IRunnableWithProgress() {
- public void run(IProgressMonitor monitor) {
- List tknList = getTokenList();
- loadDBProposals( tknList );
- }
- },
- null
- );
- }
- catch(InterruptedException e) {
- /* do nothing */
- }
- catch(InvocationTargetException e) {
- /* do nothing */
- }
- }
- }
-
- return loaded;
- }
-
-
- /**
- * Sets the default (implied) schema name to the given name. This is used
- * to qualify tables when the shema is not present. For example, if
- * setSchema("ABC") has been is called and the user enters XYZ followed by
- * ".", then the generated list of DB proposals consists of all tables under the schema IDENTIFIER1 and all columns in IDENTIFIERA.IDENTIFIER1 if such table exists
- *
- * @param schemaName the default (implied) schema name to set
- */
- public void setSchemaName( String schemaName ) {
- if (schemaName != null && schemaName.trim().length() > 0)
- fImpliedSchemaName = schemaName;
- else
- fImpliedSchemaName = null;
- }
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.datatools.sqltools.sqleditor/src/org/eclipse/datatools/sqltools/sqleditor/internal/sql/SQLDoubleClickStrategy.java b/plugins/org.eclipse.datatools.sqltools.sqleditor/src/org/eclipse/datatools/sqltools/sqleditor/internal/sql/SQLDoubleClickStrategy.java
deleted file mode 100644
index 9c173cd..0000000
--- a/plugins/org.eclipse.datatools.sqltools.sqleditor/src/org/eclipse/datatools/sqltools/sqleditor/internal/sql/SQLDoubleClickStrategy.java
+++ /dev/null
@@ -1,249 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 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 is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.datatools.sqltools.sqleditor.internal.sql;
-
-import org.eclipse.jface.text.BadLocationException;
-import org.eclipse.jface.text.IDocument;
-import org.eclipse.jface.text.ITextDoubleClickStrategy;
-import org.eclipse.jface.text.ITextViewer;
-
-/**
- * This class handles double clicks in content in the SQL Editor.
- */
-public class SQLDoubleClickStrategy implements ITextDoubleClickStrategy {
- protected ITextViewer fText;
- protected int fPos;
- protected int fStartPos;
- protected int fEndPos;
-
- protected static char[] fgBrackets = { '(', ')', '[', ']', '\'', '\'', '"', '"' };
-
- /**
- * Constructs an instance of this class. This is the default constructor.
- */
- public SQLDoubleClickStrategy() {
- super();
- }
-
- /**
- * Handles a double-click action by selecting the current word.
- *
- * @see org.eclipse.jface.text.ITextDoubleClickStrategy#doubleClicked(ITextViewer)
- */
- public void doubleClicked(ITextViewer viewer) {
- // Get the double-click location in the document.
- fPos = viewer.getSelectedRange().x;
-
- if (fPos < 0) {
- return;
- }
-
- // Get the viewer we are dealing with.
- fText = viewer;
-
- if (!selectBracketBlock()) {
- selectWord();
- }
- }
-
- /**
- * Attempts to find and match opening or closing brackets just ahead of the
- * double-click location. Sets fStartPos and fEndPos to the bracket locations
- * if found.
- *
- * @return true if brackets found and matched, otherwise false
- */
- protected boolean matchBracketsAt() {
- char prevChar, nextChar;
- int i;
- int bracketIndex1 = fgBrackets.length;
- int bracketIndex2 = fgBrackets.length;
-
- fStartPos = -1;
- fEndPos = -1;
-
- // Get the chars preceding and following the start position.
- try {
- IDocument doc = fText.getDocument();
- prevChar = doc.getChar(fPos - 1);
- nextChar = doc.getChar(fPos);
-
- // Is the char either an open or close bracket?
- for (i= 0; i < fgBrackets.length; i = i + 2) {
- if (prevChar == fgBrackets[i]) {
- fStartPos = fPos - 1;
- bracketIndex1 = i;
- }
- }
- for (i= 1; i < fgBrackets.length; i = i + 2) {
- if (nextChar == fgBrackets[i]) {
- fEndPos = fPos;
- bracketIndex2 = i;
- }
- }
-
- // If we found an open bracket, find the matching closing bracket.
- if (fStartPos > -1 && bracketIndex1 < bracketIndex2) {
- fEndPos = searchForClosingBracket( fStartPos, prevChar, fgBrackets[bracketIndex1 + 1], doc );
- if (fEndPos > -1)
- return true;
-
- fStartPos= -1;
- }
- // Otherwise if we found a closing bracket, find the matching open bracket.
- else if (fEndPos > -1) {
- fStartPos = searchForOpenBracket( fEndPos, fgBrackets[bracketIndex2 - 1], nextChar, doc );
- if (fStartPos > -1)
- return true;
-
- fEndPos= -1;
- }
-
- } catch (BadLocationException x) {
- }
-
- return false;
- }
-
- /**
- * Attempts to determine and set the start (fStartPos) and end (fEndPos) of the word
- * that was double-clicked.
- *
- * @return true if the bounds of the word were successfully determined, otherwise false.
- */
- protected boolean matchWord() {
- IDocument doc = fText.getDocument();
-
- try {
- int pos = fPos;
- char c;
-
- // Scan backwards for the start of the word.
- while (pos >= 0) {
- c = doc.getChar(pos);
- // Yes we know this isn't Java code we are parsing but the
- // Java identifier rule is close enough for now.
- if (!Character.isJavaIdentifierPart(c))
- break;
- --pos;
- }
- fStartPos = pos;
-
- // Scan forward for the end of the word.
- pos = fPos;
- int length = doc.getLength();
- while (pos < length) {
- c = doc.getChar(pos);
- if (!Character.isJavaIdentifierPart(c))
- break;
- ++pos;
- }
- fEndPos = pos;
-
- return true;
- } catch (BadLocationException x) {
- }
-
- return false;
- }
-
- /**
- * Returns the position of the closing bracket after startPosition.
- *
- * @param startPosition the starting position for the search
- * @param openBracket the open bracket character
- * @param closeBracket the close bracker character
- * @param document the document being searched
- * @return the location of the closing bracket
- */
- protected int searchForClosingBracket( int startPosition, char openBracket, char closeBracket, IDocument document ) throws BadLocationException {
- int stack = 1;
- int closePosition = startPosition + 1;
- int length = document.getLength();
- char nextChar;
-
- // Scan forward for the closing bracket. Ignore "nested" bracket pairs.
- while (closePosition < length && stack > 0) {
- nextChar = document.getChar( closePosition );
- if (nextChar == openBracket && nextChar != closeBracket)
- stack++;
- else if (nextChar == closeBracket)
- stack--;
- closePosition++;
- }
-
- if (stack == 0)
- return closePosition - 1;
-
- return -1;
- }
-
- /**
- * Returns the position of the open bracket before startPosition.
- *
- * @param startPosition the starting position for the search
- * @param openBracket the open bracket character
- * @param closeBracket the close bracket character
- * @param document the document being searched
- * @return the location of the open bracket
- */
- protected int searchForOpenBracket( int startPosition, char openBracket, char closeBracket, IDocument document ) throws BadLocationException {
- int stack = 1;
- int openPos = startPosition - 1;
- char nextChar;
-
- // Scan backward for the opening bracket. Ignore "nested" bracket pairs.
- while (openPos >= 0 && stack > 0) {
- nextChar= document.getChar(openPos);
- if (nextChar == closeBracket && nextChar != openBracket)
- stack++;
- else if (nextChar == openBracket)
- stack--;
- openPos--;
- }
-
- if (stack == 0)
- return openPos + 1;
-
- return -1;
- }
-
- /**
- * Select the area between the selected bracket and the closing bracket. Return
- * true if successful.
- *
- * @return <code>true</code> when selection is OK, <code>false</code> when not
- */
- protected boolean selectBracketBlock() {
- if (matchBracketsAt()) {
- if (fStartPos == fEndPos)
- fText.setSelectedRange(fStartPos, 0);
- else
- fText.setSelectedRange(fStartPos + 1, fEndPos - fStartPos - 1);
-
- return true;
- }
- return false;
- }
-
- /**
- * Selects the word at the current selection location.
- */
- protected void selectWord() {
- if (matchWord()) {
- if (fStartPos == fEndPos)
- fText.setSelectedRange(fStartPos, 0);
- else
- fText.setSelectedRange(fStartPos + 1, fEndPos - fStartPos - 1);
- }
- }
-
-} // end class
diff --git a/plugins/org.eclipse.datatools.sqltools.sqleditor/src/org/eclipse/datatools/sqltools/sqleditor/internal/sql/SQLPartitionScanner.java b/plugins/org.eclipse.datatools.sqltools.sqleditor/src/org/eclipse/datatools/sqltools/sqleditor/internal/sql/SQLPartitionScanner.java
deleted file mode 100644
index 13019db..0000000
--- a/plugins/org.eclipse.datatools.sqltools.sqleditor/src/org/eclipse/datatools/sqltools/sqleditor/internal/sql/SQLPartitionScanner.java
+++ /dev/null
@@ -1,121 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 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 is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.datatools.sqltools.sqleditor.internal.sql;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.datatools.sqltools.sqleditor.internal.SQLEditorPlugin;
-import org.eclipse.jface.text.BadLocationException;
-import org.eclipse.jface.text.IDocument;
-import org.eclipse.jface.text.ITypedRegion;
-import org.eclipse.jface.text.TextUtilities;
-import org.eclipse.jface.text.rules.EndOfLineRule;
-import org.eclipse.jface.text.rules.IPredicateRule;
-import org.eclipse.jface.text.rules.RuleBasedPartitionScanner;
-import org.eclipse.jface.text.rules.SingleLineRule;
-import org.eclipse.jface.text.rules.Token;
-
-/**
- * The SQLPartitionScanner is a RulesBasedPartitionScanner. The SQL document
- * partitions are computed dynamically as events signal that the document has
- * changed. The document partitions are based on tokens that represent comments
- * and SQL code sections.
- */
-public class SQLPartitionScanner extends RuleBasedPartitionScanner {
- // Define constants for SQL comments, literals, and identifiers.
- public final static String SQL_DEFAULT = "__default_sql_block__"; //$NON-NLS-1$
- public final static String SQL_COMMENT = "__sql_comment__"; //$NON-NLS-1$
- public final static String SQL_QUOTED_LITERAL = "__sql_quoted_literal__"; //$NON-NLS-1$
- public final static String SQL_DELIMITED_IDENTIFIER = "__sql_delimited_identifier__"; //$NON-NLS-1$
-
- // Define constants for SQL DML Statements.
- public final static String SQL_SELECT = "__sql_select_statement__"; //$NON-NLS-1$
- public final static String SQL_INSERT = "__sql_insert_statement__"; //$NON-NLS-1$
- public final static String SQL_UPDATE = "__sql_update_statement__"; //$NON-NLS-1$
- public final static String SQL_DELETE = "__sql_delete_statement__"; //$NON-NLS-1$
- public final static String SQL_MERGE = "__sql_merge_statement__"; //$NON-NLS-1$
-
- // Define constants for SQL DDL Statements.
- public final static String SQL_CREATE = "__sql_create_statement__"; //$NON-NLS-1$
- public final static String SQL_DROP = "__sql_drop_statement__"; //$NON-NLS-1$
- public final static String SQL_ALTER = "__sql_alter_statement__"; //$NON-NLS-1$
-
- // Define constants for SQL access control statements.
- public final static String SQL_GRANT = "__sql_grant_statement__"; //$NON-NLS-1$
- public final static String SQL_REVOKE = "__sql_revoke_statement__"; //$NON-NLS-1$
-
- // Define constants for SQL transaction control statements.
- public final static String SQL_COMMIT = "__sql_commit_statement__"; //$NON-NLS-1$
- public final static String SQL_ROLLBACK = "__sql_rollback_statement__"; //$NON-NLS-1$
- public final static String SQL_SET = "__sql_set_statement__"; //$NON-NLS-1$
-
- // Define constants for SQL connection statements.
- public final static String SQL_CONNECT = "__sql_connect_statement__"; //$NON-NLS-1$
- public final static String SQL_DISCONNECT = "__sql_disconnect_statement__"; //$NON-NLS-1$
-
- // Define constants for SQL miscellaneous statements.
- public final static String SQL_COMMENT_ON = "__sql_comment_on_statement__"; //$NON-NLS-1$
- public final static String SQL_TERMINATE = "__sql_terminate_statement__"; //$NON-NLS-1$
- public final static String SQL_CATALOG = "__sql_catalog_statement__"; //$NON-NLS-1$
- public final static String SQL_UNCATALOG = "__sql_uncatalog_statement__"; //$NON-NLS-1$
- public final static String SQL_SIGNAL = "__sql_signal_statement__"; //$NON-NLS-1$
-
- // Define a constant for SQL not otherwise covered.
- public final static String SQL_UNKNOWNSQL = "__sql__unknownsql_statement__"; //$NON-NLS-1$
-
- public final static String[] SQL_PARTITION_TYPES= new String[] {
- SQL_COMMENT,
- SQL_QUOTED_LITERAL,
- SQL_DELIMITED_IDENTIFIER,
- };
-
- /**
- * Gets the partitions of the given document as an array of
- * <code>ITypedRegion</code> objects. There is a distinct non-overlapping partition
- * for each comment line, string literal, delimited identifier, and "everything else"
- * (that is, SQL code other than a string literal or delimited identifier).
- *
- * @param doc the document to parse into partitions
- * @return an array containing the document partion regions
- */
- public static ITypedRegion[] getDocumentRegions( IDocument doc ) {
- ITypedRegion[] regions = null;
- try {
- regions = TextUtilities.computePartitioning( doc, SQLEditorPlugin.SQL_PARTITIONING, 0, doc.getLength(), false );
- }
- catch ( BadLocationException e ) {
- // ignore
- }
-
- return regions;
- }
-
- /**
- * Constructs an instance of this class. Creates rules to parse comment
- * partitions in an SQL document. This is the default constructor.
- */
- public SQLPartitionScanner() {
- super();
-
- List rules= new ArrayList();
-
- // Add rules for comments, quoted literals, and delimited identifiers.
- rules.add( new EndOfLineRule( "--", new Token( SQL_COMMENT )));
- rules.add( new SingleLineRule( "'", "'", new Token( SQL_QUOTED_LITERAL ), '\\' ));
- rules.add( new SingleLineRule( "\"", "\"", new Token( SQL_DELIMITED_IDENTIFIER ), '\\' ));
-
- IPredicateRule[] result= new IPredicateRule[ rules.size() ];
- rules.toArray( result );
- setPredicateRules( result );
- }
-
-} // end class
diff --git a/plugins/org.eclipse.datatools.sqltools.sqleditor/src/org/eclipse/datatools/sqltools/sqleditor/internal/sql/SQLSegment.java b/plugins/org.eclipse.datatools.sqltools.sqleditor/src/org/eclipse/datatools/sqltools/sqleditor/internal/sql/SQLSegment.java
deleted file mode 100644
index 6b5e5ad..0000000
--- a/plugins/org.eclipse.datatools.sqltools.sqleditor/src/org/eclipse/datatools/sqltools/sqleditor/internal/sql/SQLSegment.java
+++ /dev/null
@@ -1,173 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 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 is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.datatools.sqltools.sqleditor.internal.sql;
-
-import org.eclipse.jface.text.Position;
-
-/**
- * This class defines a segment in a SQL source document.
- */
-public class SQLSegment {
-
- private int fIndex = -1;
- private String fKind = null;
- private String fMessage = null;
- private String fPartitionLabel = null;
- private String fPartitionType = null;
- private Position fPosition = null;
- private boolean fValid = false;
-
- /**
- * Creates an instance of this class. This is the default constructor.
- */
- public SQLSegment() {
- super();
- }
-
- /**
- * Gets the index of this partition segment.
- *
- * @return the partition segment index
- */
- public int getIndex() {
- return fIndex;
- }
-
- /**
- * Gets a string indicating the kind of partition segment this is.
- *
- * @return the partition segment kind
- */
- public String getKind() {
- return fKind;
- }
-
- /**
- * Gets the message associated with this partition segment, or null if the
- * partition segment has no message.
- *
- * @return the message associated with the segment
- */
- public String getMessage() {
- return fMessage;
- }
-
- /**
- * Gets the partition label of this partition segment.
- *
- * @return the partition segment label
- */
- public String getPartitionLabel() {
- if (fPartitionLabel == null)
- setPartitionLabel("Not Labelled"); //$NON-NLS-1$
- return fPartitionLabel.toLowerCase();
- }
-
- /**
- * Gets the position of this segment.
- *
- * @return the segments position
- */
- public Position getPosition() {
- return fPosition;
- }
-
- /**
- * Gets the type of this partition segment.
- *
- * @return the partition segment's type
- */
- public String getType() {
- return fPartitionType;
- }
-
- /**
- * Gets whether or not the partition segment is valid.
- *
- * @return <code>true</code> when the partition segment is valid, otherwise false
- */
- public boolean isValid() {
- return fValid;
- }
-
- /**
- * Sets the index of the partition segment to the given value.
- *
- * @param index the partition segment index
- */
- public void setIndex(int index) {
- fIndex = index;
- }
-
- /**
- * Sets what kind of partition segment this is.
- *
- * @param kind the partition segment kind
- */
- public void setKind( String kind ) {
- fKind = kind;
- }
-
- /**
- * Sets the message associated with this partition segment to the given message.
- *
- * @param message the message to associate with the segment
- */
- public void setMessage( String message ) {
- fMessage = message;
- }
-
- /**
- * Sets the partition label of this partition segment to the given label.
- *
- * @param partitionLabel the partition label to set
- */
- public void setPartitionLabel( String partitionLabel ) {
- fPartitionLabel = partitionLabel;
- }
-
- /**
- * Sets the position of the partition segment to the given position.
- *
- * @param position the position of this partition segment
- */
- public void setPosition( Position position ) {
- fPosition = position;
- }
-
- /**
- * Sets the type of this partition segment to the given type.
- *
- * @param partitionType the partition segment type to set
- */
- public void setType( String partitionType ) {
- fPartitionType = partitionType;
- }
-
- /**
- * Sets whether or not the partition segment is valid.
- *
- * @param valid <code>true</code> when the partition segment is valid, otherwise false
- */
- public void setValid( boolean valid ) {
- fValid = valid;
- }
-
- /**
- * Returns a String that represents the value of this object.
- *
- * @return a string representation of the receiver
- */
- public String toString() {
- return getPartitionLabel();
- }
-
-} // end class
\ No newline at end of file
diff --git a/plugins/org.eclipse.datatools.sqltools.sqleditor/src/org/eclipse/datatools/sqltools/sqleditor/internal/utils/SQLColorProvider.java b/plugins/org.eclipse.datatools.sqltools.sqleditor/src/org/eclipse/datatools/sqltools/sqleditor/internal/utils/SQLColorProvider.java
deleted file mode 100644
index ce7da89..0000000
--- a/plugins/org.eclipse.datatools.sqltools.sqleditor/src/org/eclipse/datatools/sqltools/sqleditor/internal/utils/SQLColorProvider.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 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 is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.datatools.sqltools.sqleditor.internal.utils;
-
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Map;
-
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.graphics.RGB;
-import org.eclipse.swt.widgets.Display;
-
-/**
- * This class defines colors used in the SQL editor.
- */
-public class SQLColorProvider {
-
- public static final RGB SQL_COMMENT_COLOR = new RGB( 0, 0, 128 ); // dark blue
- public static final RGB SQL_MULTILINE_COMMENT_COLOR = new RGB( 128, 0, 0 ); // dark red
- public static final RGB SQL_QUOTED_LITERAL_COLOR = new RGB( 0, 0, 255 ); // bright blue
- public static final RGB SQL_KEYWORD_COLOR = new RGB( 128, 0, 0 ); // dark red
- public static final RGB SQL_IDENTIFIER_COLOR = new RGB( 0, 0, 128 ); // dark blue
- public static final RGB SQL_DELIMITED_IDENTIFIER_COLOR = new RGB( 0, 128, 0 ); // dark green
- public static final RGB SQL_DEFAULT_COLOR = new RGB( 0, 0, 0 ); // black
-
- // Define colors that can be used when the display is in "high contrast" mode.
- // (High contrast is a Windows feature that helps vision impaired people.)
- public static final RGB SQL_HC_COMMENT_COLOR = new RGB( 255, 0, 0 ); // bright red
- public static final RGB SQL_HC_MULTILINE_COMMENT_COLOR = new RGB( 0, 0, 255 ); // bright blue
- public static final RGB SQL_HC_QUOTED_LITERAL_COLOR = new RGB( 0, 255, 0 ); // bright green
- public static final RGB SQL_HC_KEYWORD_COLOR = new RGB( 255, 255, 0 ); // yellow
- public static final RGB SQL_HC_IDENTIFIER_COLOR = new RGB( 0, 0, 255 ); // bright blue
- public static final RGB SQL_HC_DELIMITED_IDENTIFIER_COLOR = new RGB( 255, 0, 0 ) ; // bright red
- public static final RGB SQL_HC_DEFAULT_COLOR = new RGB( 255, 255, 255 ); // bright white
-
- protected Map fColorTable = new HashMap(10);
-
- /**
- * Release all of the color resources held onto by the receiver.
- */
- public void dispose() {
- Iterator e = fColorTable.values().iterator();
- while (e.hasNext())
- ((Color) e.next()).dispose();
- }
-
- /**
- * Gets a Color object for the given RGB value.
- *
- * @param rgb the RGB value for which the Color object is needed
- * @return the Color object corresponding to the RGB value
- */
- public Color getColor( RGB rgb ) {
- Color color = (Color) fColorTable.get( rgb );
- // If this is first time the color has been requested, create the
- // color and put it in our Map associated with its RGB value.
- if (color == null) {
- color = new Color( Display.getCurrent(), rgb );
- fColorTable.put( rgb, color );
- }
- return color;
- }
-
-} // end class
diff --git a/plugins/org.eclipse.datatools.sqltools.sqleditor/src/org/eclipse/datatools/sqltools/sqleditor/internal/utils/SQLDBUtils.java b/plugins/org.eclipse.datatools.sqltools.sqleditor/src/org/eclipse/datatools/sqltools/sqleditor/internal/utils/SQLDBUtils.java
deleted file mode 100644
index 40b518a..0000000
--- a/plugins/org.eclipse.datatools.sqltools.sqleditor/src/org/eclipse/datatools/sqltools/sqleditor/internal/utils/SQLDBUtils.java
+++ /dev/null
@@ -1,231 +0,0 @@
-/*
-* Copyright (c) 2005. 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
-* http://www.eclipse.org/legal/epl-v10.html
-*
-* Contributors:
-* IBM Corporation - initial API and implementation
-*/
-
-package org.eclipse.datatools.sqltools.sqleditor.internal.utils;
-
-import java.sql.Connection;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.sql.Statement;
-
-import org.eclipse.datatools.connectivity.connection.internal.ui.wizards.shared.UserIdentification;
-import org.eclipse.datatools.connectivity.internal.core.connection.ConnectionInfo;
-import org.eclipse.datatools.connectivity.internal.core.util.DatabaseProviderHelper;
-import org.eclipse.datatools.sqltools.sqleditor.internal.SQLEditorResources;
-import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.jface.window.Window;
-import org.eclipse.swt.widgets.Display;
-
-/**
- * Provides database services for the editor. This includes services for selecting
- * and re-establishing a database connection.
- *
- * @author Hetty Dougherty
- * @author bgp
- */
-public class SQLDBUtils {
-
- protected static int PROPOSAL_TYPE_INVALID = -1;
- protected static int PROPOSAL_TYPE_TABLES = 1;
- protected static int PROPOSAL_TYPE_COLUMNS = 2;
-
- /**
- * Creates a SQL Statement and execute the statement using JDBC executeQuery
- * method. This method uses a Statement object to execute the query. It does
- * not close the Statement exlicitly because the ResultSet object will be
- * closed if the Statement is closed.
- *
- * @param conn the <code>Connection</code> object to use
- * @param sql the SQL statement to execute
- * @return The <code>ResultSet</code> resulting from running the query
- */
- public static ResultSet executeSQL( Connection conn, String sql )
- throws SQLException {
- ResultSet result = null;
- Statement statement = null;
- try {
- statement = conn.createStatement();
- result = statement.executeQuery( sql );
- }
- catch (SQLException ex) {
- if (statement != null)
- statement.close();
- throw ex;
- }
- return result;
- }
-
- /**
- * Determines if the DB connection described by the given <code>ConnectionInfo</code>
- * is actively connected
- *
- * @param connInfo the <code>ConnectionInfo</code> to check
- * @return true if the connection is active, otherwise false
- */
- public static boolean isConnected( ConnectionInfo connInfo ) {
- boolean connected = false;
-
- if (connInfo != null && connInfo.getSharedDatabase() != null) {
- connected = true;
- }
- return connected;
- }
-
- /**
- * Determines if the given <code>ConnectionInfo</code> is references the
- * default user ID. This is done by checking if both the user ID and password
- * are empty and non-null.
- *
- * @param connInfo the <code>ConnectionInfo</code> object to check
- * @return true if the default user ID is being used, otherwise false
- */
- public static boolean isDefaultUser( ConnectionInfo connInfo ) {
-
- String username = null;
- String password = null;
-
- if (connInfo != null) {
- username = connInfo.getUserName();
- password = connInfo.getPassword();
- }
-
- return (username != null && username.length() == 0 && password != null && password.length() == 0);
- }
-
- /**
- * Determines if a user ID and password prompt is needed for the given
- * <code>ConnectionInfo</code> object. This is done by checking if either
- * the user ID or password is null or empty.
- *
- * @param connInfo the <code>ConnectionInfo</code> to check
- * @param true when userid/password prompt is needed, otherwise false
- */
- public static boolean isPromptNeeded( ConnectionInfo connInfo ) {
-
- String username = null;
- String password = null;
-
- if (connInfo != null) {
- username = connInfo.getUserName();
- password = connInfo.getPassword();
- }
-
- return (((username == null || username.length() == 0 || password == null || password.length() == 0)) && !isDefaultUser( connInfo ));
- }
-
- /**
- * Prompts for the user ID and password and updates the given <code>ConnectionInfo</code>
- * object
- *
- * @param connInfo the <code>ConnectionInfo</code> object to update
- * @param promptMessage a message to display at the top of the prompt
- * @return true if the user clicks OK, otherwise false
- */
- public static boolean promptIDPW( ConnectionInfo connInfo, String promptMessage ) {
- boolean ok = false;
- if (connInfo != null) {
- String username = connInfo.getUserName();
- if (username == null || username.length() == 0)
- username = System.getProperty( "user.name" ); //$NON-NLS-1$
- UserIdentification idDialog = new UserIdentification( username, promptMessage );
- if (idDialog.open() == Window.OK) {
- username = idDialog.getUserNameInformation();
- String password = idDialog.getPasswordInformation();
- connInfo.setUserName( username == null ? "" : username ); //$NON-NLS-1$
- connInfo.setPassword( password == null ? "" : password ); //$NON-NLS-1$
- ok = true;
- try {
- connInfo.saveConnectionInfo();
- }
- catch (Exception e) {
- ok = false;
- }
- }
- }
- return ok;
- }
-
- /**
- * Determines if we are able to connect, prompts the user if needed,
- * reconstructs connnection information if needed, and reconnects, if possible.
- *
- * @param connInfo the <code>ConnectionInfo</code> to use to reestablish the connection
- * @return true if we are able to re-establish the connection, otherwise false
- */
- public static boolean reestablishConnection( ConnectionInfo connInfo ) {
- boolean reestablished = false;
-
- if (connInfo != null) {
- reestablished = true;
-
- if (isConnected( connInfo ) == false) {
- /* Prompt for the userid and password if needed. */
- if (isPromptNeeded( connInfo ) == true) {
- if (promptIDPW( connInfo, null ) == false) {
- /* The user cancelled from the userid/password prompt. */
- reestablished = false;;
- }
- }
- }
-
- /* If things are OK so far, test the connection. */
- if (reestablished == true) {
- StringBuffer msg = new StringBuffer();
- reestablished = testConnection( connInfo, msg );
-
- if (msg.length() > 0) {
- MessageDialog.openError( Display.getCurrent().getActiveShell(),
- SQLEditorResources.getString( "SQLEditor.connection.errorDialog.title" ), //$NON-NLS-1$
- SQLEditorResources.getString( "SQLeditor.connection.errorDialog.message", //$NON-NLS-1$
- new Object[] { msg.toString() } ) );
- }
- }
- }
-
- return reestablished;
- }
-
- /**
- * Tests the connection indicated by the given <code>ConnectionInfo</code>
- * and returns whether or not the connection is valid. Error messages, if any,
- * are returned in the given <code>StringBuffer</code>.
- *
- * @param connInfo the <code>ConnectionInfo</code> for the connection to test
- * @param msgBuf a buffer for error messages if any are generated by the test
- * @return true if the connection is OK
- */
- public static boolean testConnection( ConnectionInfo connInfo, StringBuffer msgBuf ) {
- boolean connectedOK = false;
- if (connInfo != null) {
- connectedOK = true;
- Connection testConn = connInfo.getSharedConnection();
- if (testConn == null) {
- connectedOK = false;
- try {
- testConn = connInfo.connect();
- if (testConn != null) {
- connInfo.setSharedConnection( testConn );
- new DatabaseProviderHelper().setDatabase( testConn,
- connInfo, connInfo.getDatabaseName() );
- connInfo.saveConnectionInfo();
- connectedOK = true;
- }
- }
- catch (Exception e) {
- msgBuf.append( e.getMessage() );
- }
- }
- }
-
- return connectedOK;
- }
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.datatools.sqltools.sqleditor/src/org/eclipse/datatools/sqltools/sqleditor/internal/utils/SQLMultiLineRule.java b/plugins/org.eclipse.datatools.sqltools.sqleditor/src/org/eclipse/datatools/sqltools/sqleditor/internal/utils/SQLMultiLineRule.java
deleted file mode 100644
index d8dd069..0000000
--- a/plugins/org.eclipse.datatools.sqltools.sqleditor/src/org/eclipse/datatools/sqltools/sqleditor/internal/utils/SQLMultiLineRule.java
+++ /dev/null
@@ -1,760 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2004 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.datatools.sqltools.sqleditor.internal.utils;
-
-import org.eclipse.jface.text.rules.ICharacterScanner;
-import org.eclipse.jface.text.rules.IToken;
-import org.eclipse.jface.text.rules.MultiLineRule;
-import org.eclipse.jface.text.rules.Token;
-
-public class SQLMultiLineRule extends MultiLineRule {
-
- private static final char fgSingleQuote = '\'';
- private static final char fgDoubleQuote = '\"';
-
- private boolean fIsCaseSensitive = false;
-
- private int fSingleQuotesCount = 0;
-
- private int fDoubleQuotesCount = 0;
-
- /* for DECLARE ... END, BEGIN ... END etc. */
- private String fInnerStartBlocks[] = null;
-
- private String fInnerEndBlocks[] = null;
-
- /* for trigger ... etc. */
- private String fIncludeInnerBlockCommands[] = null;
-
- /* IF statement, CASE statement, LOOP statement, etc, all
- * of the commands need an "END" at the end of the statement.
- */
- private String fInnerBlocksWithSameEnd[] = null;
-
- private int fSameInnerBlockCounter = 0;
-
- /**
- * Creates a rule for the given starting and ending sequence
- * which, if detected, will return the specified token.
- *
- * @param startSequence the pattern's start sequence
- * @param endSequence the pattern's end sequence
- * @param token the token to be returned on success
- * @see org.eclipse.jface.text.rules.MultiLineRule#MultiLineRule(java.lang.String, java.lang.String, org.eclipse.jface.text.rules.IToken)
- */
- public SQLMultiLineRule( String startSequence, String endSequence, org.eclipse.jface.text.rules.IToken token ) {
- super( startSequence, endSequence, token );
- }
-
- /**
- * Creates a rule for the given starting and ending sequence
- * which, if detected, will return the specific token.
- * Any character which follows the given escape character will be ignored.
- *
- * @param startSequence the pattern's start sequence
- * @param endSequence the pattern's end sequence
- * @param token the token to be returned on success
- * @param escapeCharacter the escape character
- * @see org.eclipse.jface.text.rules.MultiLineRule#MultiLineRule(java.lang.String, java.lang.String, org.eclipse.jface.text.rules.IToken, char)
- */
- public SQLMultiLineRule( String startSequence, String endSequence, org.eclipse.jface.text.rules.IToken token, char escapeCharacter ) {
- super(startSequence, endSequence, token, escapeCharacter);
- }
-
- /**
- * Evaluates this rule without considering any column constraints.
- *
- * @param scanner the character scanner to be used
- * @return the token resulting from this evaluation
- * @see org.eclipse.jface.text.rules.PatternRule#doEvaluate(org.eclipse.jface.text.rules.ICharacterScanner)
- */
- protected IToken doEvaluate( ICharacterScanner scanner ) {
- int c = scanner.read();
- boolean startCondition;
-
- // if case-insensitive compare both upper and lower case
- if (fIsCaseSensitive)
- startCondition = (c == fStartSequence[0]);
- else
- startCondition = ((c == fStartSequence[0]) || (c == Character.toUpperCase(fStartSequence[0])));
-
- if (startCondition) {
- if (c == fgSingleQuote && fDoubleQuotesCount == 0)
- fSingleQuotesCount = 1 - fSingleQuotesCount;
- else if (c == fgDoubleQuote && fSingleQuotesCount == 0)
- fDoubleQuotesCount = 1 - fDoubleQuotesCount;
-
- if (sequenceDetected(scanner, fStartSequence, false)) {
- if (endSequenceDetected(scanner))
- return fToken;
- }
- }
- scanner.unread();
-
- return Token.UNDEFINED;
- }
-
- /**
- Returns whether the end sequence was detected. As the pattern can be considered
- * ended by a line delimiter, the result of this method is <code>true</code> if the
- * rule breaks on the end of the line, or if the EOF character is read.
- *
- * @param scanner the character scanner to be used
- * @return <code>true</code> if the end sequence has been detected
- * @see org.eclipse.jface.text.rules.PatternRule#endSequenceDetected(org.eclipse.jface.text.rules.ICharacterScanner)
- */
- protected boolean endSequenceDetected( ICharacterScanner scanner ) {
- int c;
- boolean esfCondition = false; // End of sequence found condition
- boolean includeInnerBlock = false;
-
- char[][] delimiters = scanner.getLegalLineDelimiters();
- while ((c = readChar(scanner)) != ICharacterScanner.EOF) {
- if (c == fEscapeCharacter)
- readChar(scanner); // Skip the escaped character.
- else {
- if (c == fgSingleQuote && fDoubleQuotesCount == 0)
- fSingleQuotesCount = 1 - fSingleQuotesCount;
- else if (c == fgDoubleQuote && fSingleQuotesCount == 0)
- fDoubleQuotesCount = 1 - fDoubleQuotesCount;
-
- if (fSingleQuotesCount != 0 || fDoubleQuotesCount != 0)
- continue;
-
- if (c == 32) // space
- continue;
-
- // check "include inner blocks" commands
- if (includeInnerBlock == false && fIncludeInnerBlockCommands != null) {
- boolean startCondition = false; // check start sequence of
- // the block
-
- for (int k = 0; k < fIncludeInnerBlockCommands.length; k++) {
- char tmpChar = fIncludeInnerBlockCommands[k].charAt(0);
- if (fIsCaseSensitive)
- startCondition = (c == tmpChar);
- else
- startCondition = (c == tmpChar || c == Character.toUpperCase(tmpChar));
-
- if (!startCondition)
- continue;
-
- if (sequenceDetected(scanner, fIncludeInnerBlockCommands[k].toCharArray(), false)) { // found
- // out
- includeInnerBlock = true;
- break;
- }
- }
- if (includeInnerBlock)
- continue;
- }
-
- // check SQL block
- if (fInnerStartBlocks != null && includeInnerBlock && fInnerStartBlocks.length == fInnerEndBlocks.length) {
- boolean blockStartCondition = false, // check start sequence
- // of the block
- findBlock = false;
-
- for (int k = 0; k < fInnerStartBlocks.length; k++) {
- char tmpChar = fInnerStartBlocks[k].charAt(0);
- if (fIsCaseSensitive)
- blockStartCondition = (c == tmpChar);
- else
- blockStartCondition = (c == tmpChar || c == Character.toUpperCase(tmpChar));
-
- if (!blockStartCondition)
- continue;
-
- if (sequenceDetected(scanner, fInnerStartBlocks[k].toCharArray(), false)) {
- /* special case for DECLARE */
- if (fInnerStartBlocks[k].equalsIgnoreCase("DECLARE")) //$NON-NLS-1$
- endDECLARESequenceDetected(scanner);
- /* special case for BEGIN */
- else if (fInnerStartBlocks[k].equalsIgnoreCase("BEGIN")) //$NON-NLS-1$
- endBEGINSequenceDetected(scanner);
- else
- endBlockSequenceDetected(scanner, fInnerEndBlocks[k].toCharArray());
- findBlock = true;
- break;
- }
- }
- if (findBlock)
- continue;
- }
-
- // check end sequence
- if (fEndSequence.length > 0) {
- if (fIsCaseSensitive)
- esfCondition = (c == fEndSequence[0]);
- else
- esfCondition = (c == fEndSequence[0] || c == Character.toUpperCase(fEndSequence[0]));
- }
-
- if (esfCondition) { // Check if the specified end sequence has been found
- if (sequenceDetected(scanner, fEndSequence, true))
- return true;
- } else if (fBreaksOnEOL) { // Check for end of line since it can
- // be used to terminate the pattern.
- for (int i = 0; i < delimiters.length; i++) {
- if (c == delimiters[i][0] && sequenceDetected(scanner, delimiters[i], false))
- return true;
- }
- }
- }
- }
- scanner.unread();
-
- return true;
- }
-
- /**
- * Evaluates the rule by examining the characters available from
- * the provided character scanner. The token returned by this rule
- * returns <code>true</code> when calling <code>isUndefined</code>,
- * if the text the rule investigated does not match the rule's requirements.
- *
- * @param scanner the character scanner to be used by this rule
- * @return the token computed by the rule
- * @see org.eclipse.jface.text.rules.PatternRule#evaluate(org.eclipse.jface.text.rules.ICharacterScanner)
- * @see org.eclipse.jface.text.rules.IRule#evaluate(org.eclipse.jface.text.rules.ICharacterScanner)
- */
- public IToken evaluate( ICharacterScanner scanner ) {
- fSingleQuotesCount = 0;
- fDoubleQuotesCount = 0;
-
- //MG** don't forget to add case-sensitive handling
- if (fColumn == UNDEFINED)
- return doEvaluate(scanner);
-
- int c = scanner.read();
- boolean startCondition;
- scanner.unread();
-
- // if case-insensitive compare both upper and lower case
- if (fIsCaseSensitive)
- startCondition = (c == fStartSequence[0]);
- else
- startCondition = ((c == fStartSequence[0]) || (c == Character.toUpperCase(fStartSequence[0])));
-
- if (startCondition)
- return (fColumn == scanner.getColumn() ? doEvaluate(scanner) : Token.UNDEFINED);
-
- return Token.UNDEFINED;
- }
-
- /**
- * Gets whether or not to consider case when matching the rule pattern.
- *
- * @return boolean <code>true</code> when case should be considered,
- * otherwise <code>false</code>
- */
- public boolean isCaseSensitive() {
- return fIsCaseSensitive;
- }
-
- /**
- * Returns whether the next characters to be read by the character scanner
- * are an exact match with the given sequence. No escape characters are allowed
- * within the sequence. If specified the sequence is considered to be found
- * when reading the EOF character.
- *
- * @param scanner the character scanner to be used
- * @param sequence the sequence to be detected
- * @param eofAllowed indicated whether EOF terminates the pattern
- * @return <code>true</code> if the given sequence has been detected
- * @see org.eclipse.jface.text.rules.PatternRule#sequenceDetected(org.eclipse.jface.text.rules.ICharacterScanner, char[], boolean)
- */
- protected boolean sequenceDetected(ICharacterScanner scanner, char[] sequence, boolean eofAllowed) {
- // Compare the current character to both upper and lower case sequence
- char[] ucSequence = new char[sequence.length];
- boolean nmcCondition;
-
- if (!fIsCaseSensitive) {
- for (int i = 0; i < sequence.length; i++)
- // Load upper character version of sequence
- ucSequence[i] = Character.toUpperCase(sequence[i]);
- }
-
- int tsQC = fSingleQuotesCount, tdQC = fDoubleQuotesCount;
- int c = -1;
- for (int i = 1; i < sequence.length; i++) {
- c = scanner.read();
-
- if (c == fgSingleQuote && fDoubleQuotesCount == 0)
- fSingleQuotesCount = 1 - fSingleQuotesCount;
- else if (c == fgDoubleQuote && fSingleQuotesCount == 0)
- fDoubleQuotesCount = 1 - fDoubleQuotesCount;
-
- if (fIsCaseSensitive)
- nmcCondition = (c != sequence[i]);
- else
- nmcCondition = (c != sequence[i] && c != ucSequence[i]);
-
- if (c == ICharacterScanner.EOF && eofAllowed)
- return true; // match
- else if (nmcCondition) // For now test against both
- {
- // Non-matching character detected, rewind the scanner back to
- // the start.
- scanner.unread();
- for (int j = i - 1; j > 0; j--)
- scanner.unread();
- fSingleQuotesCount = tsQC;
- fDoubleQuotesCount = tdQC;
- return false;
- }
- }
-
- if (c != -1) // check the last character of the sequence and the one
- // after it
- {
- SQLWordDetector wDetector = new SQLWordDetector();
- if (wDetector.isWordPart((char) c)) {
- c = scanner.read();
- scanner.unread();
- if (wDetector.isWordPart((char) c)) // the following character
- // is the part of the "word"
- {
- // Non-matching character detected, rewind the scanner back
- // to the start.
- for (int j = sequence.length - 1; j > 0; j--)
- scanner.unread();
- fSingleQuotesCount = tsQC;
- fDoubleQuotesCount = tdQC;
- return false;
- }
- }
- }
-
- return true;
- }
-
- /**
- * Sets whether or not to consider case when matching the rule pattern.
- *
- * @param caseSensitive <code>true</code> when case should be considered,
- * otherwise <code>false</code>
- */
- public void setCaseSensitive(boolean csensitive) {
- fIsCaseSensitive = csensitive;
- }
-
- /**
- * Goes through the document using the given scanner and stops at the
- * given sequence (the end blocks sequence).
- *
- * @param scanner the scanner to use
- * @param sequence the end block sequence
- * @return boolean <code>true</code> when end block sequence found,
- * otherwise <code>false</code>
- */
- private boolean endBlockSequenceDetected( ICharacterScanner scanner, char[] sequence ) {
- int c;
- boolean esfCondition = false; // End of sequence found condition
-
- char[][] delimiters = scanner.getLegalLineDelimiters();
- while ((c = readChar(scanner)) != ICharacterScanner.EOF) {
- if (c == fEscapeCharacter) {
- readChar(scanner); // Skip the escaped character.
- continue;
- }
-
- if (c == fgSingleQuote && fDoubleQuotesCount == 0)
- fSingleQuotesCount = 1 - fSingleQuotesCount;
- else if (c == fgDoubleQuote && fSingleQuotesCount == 0)
- fDoubleQuotesCount = 1 - fDoubleQuotesCount;
-
- if (fSingleQuotesCount != 0 || fDoubleQuotesCount != 0) // inside the
- // quotes
- continue;
-
- if (c == 32) // space
- continue;
-
- // check special commands
- if (fInnerBlocksWithSameEnd != null) {
- boolean blockStartCondition = false, // check start sequence of
- // the block
- findBlock = false;
-
- for (int k = 0; k < fInnerBlocksWithSameEnd.length; k++) {
- char tmpChar = fInnerBlocksWithSameEnd[k].charAt(0);
- if (fIsCaseSensitive)
- blockStartCondition = (c == tmpChar);
- else
- blockStartCondition = (c == tmpChar || c == Character.toUpperCase(tmpChar));
-
- if (!blockStartCondition)
- continue;
-
- if (sequenceDetected(scanner, fInnerBlocksWithSameEnd[k].toCharArray(), false)) {
- endBlockSequenceDetected(scanner, sequence);
- findBlock = true;
- break;
- }
- }
- if (findBlock)
- continue;
- }
-
- // check end sequence
- if (sequence.length > 0) {
- if (fIsCaseSensitive)
- esfCondition = (c == sequence[0]);
- else
- esfCondition = (c == sequence[0] || c == Character.toUpperCase(sequence[0]));
- }
-
- if (esfCondition) { // Check if the specified end sequence has been
- // found.
- if (sequenceDetected(scanner, sequence, true))
- return true;
- } else if (fBreaksOnEOL) { // Check for end of line since it can be
- // used to terminate the pattern.
- for (int i = 0; i < delimiters.length; i++) {
- if (c == delimiters[i][0] && sequenceDetected(scanner, delimiters[i], false))
- return true;
- }
- }
-
- }
- scanner.unread();
-
- return true;
- }
-
- /**
- * Sets the inner blocks start sequence to the given pattern.
- *
- * @param innerStartBlocks the inner blocks start pattern
- */
- public void setInnerBlocksStartSequence( String innerStartBlocks[] ) {
- fInnerStartBlocks = innerStartBlocks;
- }
-
- /**
- * Sets the inner blocks end sequence to the given pattern.
- *
- * @param innerEndBlocks the inner block end pattern
- */
- public void setInnerBlocksEndSequence(String innerEndBlocks[]) {
- fInnerEndBlocks = innerEndBlocks;
- }
-
- /**
- * Sets the inner block command set to the given set of commands.
- *
- * @param innerBlockCommands the inner block commands to set
- */
- public void setIncludeInnerBlockCommands( String innerBlockCommands[] ) {
- fIncludeInnerBlockCommands = innerBlockCommands;
- }
-
- /**
- * Sets the set of inner blocks with the same end sequence to the given set.
- *
- * @param innerBlocksSameEnd set of inner blocks with same end to set
- */
- public void setInnerBlocksWithSameEndSequence( String innerBlocksSameEnd[]) {
- fInnerBlocksWithSameEnd = innerBlocksSameEnd;
- }
-
- /**
- * Detects the end sequence for a "BEGIN" block.
- *
- * @param scanner the scanner to use
- * @param endSequence the end sequence of the block
- * @return boolean <code>true</code> when end sequence found, otherwise
- * <code>false</code>
- */
- private boolean endBEGINSequenceDetected(ICharacterScanner scanner) {
- int c;
- boolean esfCondition = false; // End of sequence found condition
- char specialEnds[][] = { { 'i', 'f' }, { 'w', 'h', 'i', 'l', 'e' }, { 'f', 'o', 'r' }, { 'l', 'o', 'o', 'p' }, { 'c', 'a', 's', 'e' }, { 'r', 'e', 'p', 'e', 'a', 't' } };
- char endSequence[] = { 'e', 'n', 'd' };
- SQLWordDetector wDetector = new SQLWordDetector();
-
- while ((c = readChar(scanner)) != ICharacterScanner.EOF) {
- if (c == fEscapeCharacter) {
- readChar(scanner); // Skip the escaped character.
- continue;
- }
-
- if (c == fgSingleQuote && fDoubleQuotesCount == 0)
- fSingleQuotesCount = 1 - fSingleQuotesCount;
- else if (c == fgDoubleQuote && fSingleQuotesCount == 0)
- fDoubleQuotesCount = 1 - fDoubleQuotesCount;
- if (fSingleQuotesCount != 0 || fDoubleQuotesCount != 0) // inside the quotes
- continue;
-
- if (c == 32) // space
- continue;
-
- // check end sequence
- if (endSequence.length > 0) {
- if (fIsCaseSensitive)
- esfCondition = (c == endSequence[0]);
- else
- esfCondition = (c == endSequence[0] || c == Character.toUpperCase(endSequence[0]));
- }
- if (esfCondition) { // Check if the specified end sequence has been found.
- if (sequenceDetected(scanner, endSequence, true) && checkNextToken(scanner, specialEnds)) {
- if (fSameInnerBlockCounter <= 0)
- return true;
-
- fSameInnerBlockCounter--;
- }
- }
-
- if (wDetector.isWordPart((char) c)) {
- scanner.unread();
- char endCommandSqeuence[] = { ';' };
- char startCommandSequence[] = { 'b', 'e', 'g', 'i', 'n' };
- endSQLCommandSequenceDetected(scanner, endCommandSqeuence, startCommandSequence);
- }
- }
- scanner.unread();
-
- return true;
- }
-
- /**
- * Detects the end sequence for a "DECLARE" block. (Syntax: DECLARE ... BEGIN ... END)
- *
- * @param scanner the scanner to use
- * @param endSequence end sequence of the block
- * @return boolean <code>true</code> when end sequence found, otherwise
- * <code>false</code>
- */
- private boolean endDECLARESequenceDetected(ICharacterScanner scanner) {
- int c;
- boolean condition = false;
- char beginSequence[] = { 'b', 'e', 'g', 'i', 'n' };
- SQLWordDetector wDetector = new SQLWordDetector();
-
- while ((c = readChar(scanner)) != ICharacterScanner.EOF) {
- if (c == fEscapeCharacter) {
- readChar(scanner); // Skip the escaped character.
- continue;
- }
-
- if (c == fgSingleQuote && fDoubleQuotesCount == 0)
- fSingleQuotesCount = 1 - fSingleQuotesCount;
- else if (c == fgDoubleQuote && fSingleQuotesCount == 0)
- fDoubleQuotesCount = 1 - fDoubleQuotesCount;
- if (fSingleQuotesCount != 0 || fDoubleQuotesCount != 0) // inside the quotes
- continue;
-
- if (c == 32) // space
- continue;
-
- if (fIsCaseSensitive)
- condition = (c == beginSequence[0]);
- else
- condition = (c == beginSequence[0] || c == Character.toUpperCase(beginSequence[0]));
-
- if (condition) {
- if (sequenceDetected(scanner, beginSequence, true)) {
- endBEGINSequenceDetected(scanner);
- return true;
- }
- }
-
- if (wDetector.isWordPart((char) c)) {
- scanner.unread();
- char endCommandSqeuence[] = { ';' };
- char startCommandSequence[] = {};
- endSQLCommandSequenceDetected(scanner, endCommandSqeuence, startCommandSequence);
- }
- }
- scanner.unread();
-
- return true;
- }
-
- /**
- * Detects the end sequence for a SQL command using the given scanner and
- * end sequence.
- *
- * @param scanner the scanner to use
- * @param endSequence the end sequence of the command
- * @param innerBlock inner block which is used to recount the counter
- * (fSameInnerBlockCounter)
- * @return boolean <code>true</code> when end sequence found, otherwise
- * <code>false</code>
- */
- protected boolean endSQLCommandSequenceDetected( ICharacterScanner scanner, char endSequence[], char innerBlock[] ) {
- int c;
- boolean tmpCondition = false; // End of sequence found condition
-
- while ((c = readChar(scanner)) != ICharacterScanner.EOF) {
- if (c == fEscapeCharacter) // Skip the escaped character.
- {
- readChar(scanner);
- continue;
- }
-
- if (c == fgSingleQuote && fDoubleQuotesCount == 0)
- fSingleQuotesCount = 1 - fSingleQuotesCount;
- else if (c == fgDoubleQuote && fSingleQuotesCount == 0)
- fDoubleQuotesCount = 1 - fDoubleQuotesCount;
- // inside the quotes
- if (fSingleQuotesCount != 0 || fDoubleQuotesCount != 0)
- continue;
-
- if (c == 32) // space
- continue;
-
- // check inner blcok and recount the fSameInnerBlockCounter
- if (innerBlock.length > 0) {
- if (fIsCaseSensitive)
- tmpCondition = (c == innerBlock[0]);
- else
- tmpCondition = (c == innerBlock[0] || c == Character.toUpperCase(innerBlock[0]));
- }
- if (tmpCondition) {
- if (sequenceDetected(scanner, innerBlock, true))
- fSameInnerBlockCounter++;
- }
-
- // check end sequence
- if (endSequence.length > 0) {
- if (fIsCaseSensitive)
- tmpCondition = (c == endSequence[0]);
- else
- tmpCondition = (c == endSequence[0] || c == Character.toUpperCase(endSequence[0]));
- }
- if (tmpCondition) {
- // Check if the specified end sequence has been found.
- if (sequenceDetected(scanner, endSequence, true))
- return true;
- }
- }
- scanner.unread();
-
- return true;
- }
-
- /**
- * Checks next token using the given scanner and skip sequence.
- *
- * @param skipSequence the skip cases
- * @return boolean <code>true</code> when ..., otherwise
- * <code>false</code>
- */
- private boolean checkNextToken( ICharacterScanner scanner, char skipSequence[][] ) {
- int c, k = 0;
-
- char[][] delimiters = scanner.getLegalLineDelimiters();
- while ((c = scanner.read()) != ICharacterScanner.EOF) {
- k++;
- if (c == fEscapeCharacter) {
- scanner.read(); // Skip the escaped character.
- k++;
- continue;
- }
-
- if (c == fgSingleQuote && fDoubleQuotesCount == 0)
- fSingleQuotesCount = 1 - fSingleQuotesCount;
- else if (c == fgDoubleQuote && fSingleQuotesCount == 0)
- fDoubleQuotesCount = 1 - fDoubleQuotesCount;
-
- if (fSingleQuotesCount != 0 || fDoubleQuotesCount != 0)
- continue;
-
- if (c == 32 || c == 9) // space or tab
- continue;
-
- boolean isEndOfLine = false;
- for (int i = 0; i < delimiters.length; i++) {
- if (c == delimiters[i][0] && sequenceDetected(scanner, delimiters[i], false)) {
- isEndOfLine = true;
- break;
- }
- }
- if (isEndOfLine)
- continue;
-
- boolean condition = false;
- for (int i = 0; i < skipSequence.length; i++) {
- if (fIsCaseSensitive)
- condition = (c == skipSequence[i][0]);
- else
- condition = (c == skipSequence[i][0] || c == Character.toUpperCase(skipSequence[i][0]));
-
- if (!condition)
- continue;
-
- if (sequenceDetected(scanner, skipSequence[i], false)) {
- for (int j = skipSequence[i].length - 1; j > 0; j--)
- scanner.unread();
- break;
- }
- condition = false;
- }
-
- if (!condition) // can not find it
- {
- for (int i = 0; i < k - 1; i++)
- // rewind the scanner back to the start
- scanner.unread();
- scanner.unread();
- return true;
- }
- break;
- }
- for (int i = 0; i < k - 1; i++)
- // rewind the scanner back to the start
- scanner.unread();
- scanner.unread();
-
- return false;
- }
-
- /**
- * Reads a character, skipping characters in comments.
- *
- * @param scanner the scanner to use
- * @return int the character read
- */
- private char readChar( ICharacterScanner scanner ) {
- int c;
- char[][] delimiters = scanner.getLegalLineDelimiters();
-
- while (true) {
- c = scanner.read();
- if (c != '-')
- return (char) c;
-
- int nextC = scanner.read();
- if (nextC != '-') {
- scanner.unread();
- return (char) c;
- }
-
- boolean loop = true;
- while (loop) {
- c = scanner.read();
- if (c == ICharacterScanner.EOF)
- return (char) c;
-
- // Check for end of line since it can be used to terminate the
- // comment.
- for (int i = 0; i < delimiters.length; i++) {
- if (c == delimiters[i][0] && sequenceDetected(scanner, delimiters[i], false)) {
- loop = false;
- break;
- }
- }
- }
- }
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.datatools.sqltools.sqleditor/src/org/eclipse/datatools/sqltools/sqleditor/internal/utils/SQLWordDetector.java b/plugins/org.eclipse.datatools.sqltools.sqleditor/src/org/eclipse/datatools/sqltools/sqleditor/internal/utils/SQLWordDetector.java
deleted file mode 100644
index d746355..0000000
--- a/plugins/org.eclipse.datatools.sqltools.sqleditor/src/org/eclipse/datatools/sqltools/sqleditor/internal/utils/SQLWordDetector.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 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 is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.datatools.sqltools.sqleditor.internal.utils;
-
-import org.eclipse.datatools.sqltools.sqleditor.internal.sql.SQLCodeScanner;
-import org.eclipse.jface.text.rules.IWordDetector;
-
-/**
- * This class determines whether a given character is valid as part of an SQL keyword
- * in the current context.
- */
-public class SQLWordDetector implements IWordDetector {
-
- /**
- * Returns whether the specified character is valid as the first
- * character in a word.
- * @see org.eclipse.jface.text.rules.IWordDetector#isWordStart(char)
- */
- public boolean isWordStart( char c ) {
- String[] reservedWords = SQLCodeScanner.getSQLKeywords();
- for (int i = 0; i < reservedWords.length; i++) {
- if ( (reservedWords[i].charAt(0) == c)
- || (reservedWords[i].toLowerCase().charAt(0) == c) ) {
- return true;
- }
- }
-
- String[] datatypes = SQLCodeScanner.getSQLDatatypes();
- for (int i = 0; i < datatypes.length; i++) {
- if ( (datatypes[i].charAt(0) == c)
- || (datatypes[i].toLowerCase().charAt(0) == c) ) {
- return true;
- }
- }
-
- return false;
- }
-
- /**
- * Returns whether the specified character is valid as a subsequent character
- * in a word.
- * @see org.eclipse.jface.text.rules.IWordDetector#isWordPart(char)
- */
- public boolean isWordPart( char c ) {
- String[] keywords = SQLCodeScanner.getSQLKeywords();
- for (int i = 0; i < keywords.length; i++) {
- if ( (keywords[i].indexOf(c) != -1)
- || (keywords[i].toLowerCase().indexOf(c) != -1) ) {
- return true;
- }
- }
-
- String[] datatypes = SQLCodeScanner.getSQLDatatypes();
- for (int i = 0; i < datatypes.length; i++) {
- if ( (datatypes[i].indexOf(c) != -1)
- || (datatypes[i].toLowerCase().indexOf(c) != -1) ) {
- return true;
- }
- }
-
- return false;
- }
-
-} // end class
diff --git a/plugins/org.eclipse.datatools.sqltools.sqleditor/src/org/eclipse/datatools/sqltools/sqleditor/internal/utils/SQLWordPartDetector.java b/plugins/org.eclipse.datatools.sqltools.sqleditor/src/org/eclipse/datatools/sqltools/sqleditor/internal/utils/SQLWordPartDetector.java
deleted file mode 100644
index 1477d2d..0000000
--- a/plugins/org.eclipse.datatools.sqltools.sqleditor/src/org/eclipse/datatools/sqltools/sqleditor/internal/utils/SQLWordPartDetector.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 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 is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.datatools.sqltools.sqleditor.internal.utils;
-
-import org.eclipse.jface.text.BadLocationException;
-import org.eclipse.jface.text.ITextViewer;
-
-/**
- * This class is used to scan for SQL keywords in a document.
- */
-public class SQLWordPartDetector {
- String wordPart = ""; //$NON-NLS-1$
- int docOffset;
-
- /**
- * Constructs an instance of this class with the given text viewer and
- * document offset.
- * @param viewer text viewer for the document
- * @param documentOffset offset into the SQL document
- */
- public SQLWordPartDetector( ITextViewer viewer, int documentOffset ) {
- docOffset = documentOffset - 1;
- // Scan back in the document until we reach the beginning of the current word.
- try {
- while (((docOffset) >= viewer.getTopIndexStartOffset()) && Character.isLetterOrDigit( viewer.getDocument().getChar( docOffset ))) {
- docOffset--;
- }
- // We've gone back one step too far, so go forward one step.
- docOffset++;
- // Get the word part from the beginning of the word to the starting offset.
- wordPart = viewer.getDocument().get(docOffset, documentOffset - docOffset);
- } catch (BadLocationException e) {
- // do nothing
- }
- }
-
- /**
- * Gets the current word part from the document.
- * @return the word part
- */
- public String getString() {
- return wordPart;
- }
-
- /**
- * Gets the current document offset.
- * @return the current document offset.
- */
- public int getOffset() {
- return docOffset;
- }
-
-} // end class
diff --git a/plugins/org.eclipse.datatools.sqltools.sqlscrapbook/.classpath b/plugins/org.eclipse.datatools.sqltools.sqlscrapbook/.classpath
deleted file mode 100644
index 751c8f2..0000000
--- a/plugins/org.eclipse.datatools.sqltools.sqlscrapbook/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="src" path="src"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/plugins/org.eclipse.datatools.sqltools.sqlscrapbook/.cvsignore b/plugins/org.eclipse.datatools.sqltools.sqlscrapbook/.cvsignore
deleted file mode 100644
index e81cab1..0000000
--- a/plugins/org.eclipse.datatools.sqltools.sqlscrapbook/.cvsignore
+++ /dev/null
@@ -1,4 +0,0 @@
-bin
-temp.folder
-build.xml
-sqlscrapbook.jar
diff --git a/plugins/org.eclipse.datatools.sqltools.sqlscrapbook/.project b/plugins/org.eclipse.datatools.sqltools.sqlscrapbook/.project
deleted file mode 100644
index 6d82468..0000000
--- a/plugins/org.eclipse.datatools.sqltools.sqlscrapbook/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.datatools.sqltools.sqlscrapbook</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.ManifestBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.SchemaBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.pde.PluginNature</nature>
- <nature>org.eclipse.jdt.core.javanature</nature>
- </natures>
-</projectDescription>
diff --git a/plugins/org.eclipse.datatools.sqltools.sqlscrapbook/about.html b/plugins/org.eclipse.datatools.sqltools.sqlscrapbook/about.html
deleted file mode 100644
index 6f6b96c..0000000
--- a/plugins/org.eclipse.datatools.sqltools.sqlscrapbook/about.html
+++ /dev/null
@@ -1,22 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
-<head>
-<title>About</title>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
-
-<p>February 24, 2005</p>
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in ("Content"). Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, "Program" will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is being redistributed by another party ("Redistributor") and different terms and conditions may
-apply to your use of any object code in the Content. Check the Redistributor's license that was provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content.</p>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/plugins/org.eclipse.datatools.sqltools.sqlscrapbook/build.properties b/plugins/org.eclipse.datatools.sqltools.sqlscrapbook/build.properties
deleted file mode 100644
index e6c9752..0000000
--- a/plugins/org.eclipse.datatools.sqltools.sqlscrapbook/build.properties
+++ /dev/null
@@ -1,7 +0,0 @@
-source.sqlscrapbook.jar = src/
-bin.includes = plugin.xml,\
- sqlscrapbook.jar,\
- plugin.properties,\
- images/,\
- about.html
-output.sqlscrapbook.jar = bin/
diff --git a/plugins/org.eclipse.datatools.sqltools.sqlscrapbook/images/qrydoc.gif b/plugins/org.eclipse.datatools.sqltools.sqlscrapbook/images/qrydoc.gif
deleted file mode 100644
index cd1bd19..0000000
--- a/plugins/org.eclipse.datatools.sqltools.sqlscrapbook/images/qrydoc.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.datatools.sqltools.sqlscrapbook/plugin.properties b/plugins/org.eclipse.datatools.sqltools.sqlscrapbook/plugin.properties
deleted file mode 100644
index 694d9ca..0000000
--- a/plugins/org.eclipse.datatools.sqltools.sqlscrapbook/plugin.properties
+++ /dev/null
@@ -1,24 +0,0 @@
-! Properties file for component: SQL Scrapbook
-
-pluginName = Sqlscrapbook Plug-in
-providerName = Eclipse.org
-
-_UI_MENU_SELECT_CONNECTION= Select &Connection
-
-# SQL Scrapbook
-SQLScrapbookAction.title_UI_ = Open SQL Scrapbook
-
-ExceptionDialog.seeErrorLogMessage = See error log for more details.
-SQLScrapbookPlugin.internal_error = Internal error
-
-# ------- NewSQLScrapbookFileWizardPage-------
-NewWizardCategoryName=Data
-NewSQLScrapbookPage.label=SQL Scrapbook Page
-NewSQLScrapbookPage.description=Create a SQL Scrapbook page
-
-NewSQLScrapbookFileCreationWizard.title=New SQL Scrapbook Page
-NewSQLScrapbookFileWizardPage.title=Create SQL Scrapbook Page
-
-NewSQLScrapbookFileWizardPage.error.AlreadyExists=A file with the specified path already exists.
-NewSQLScrapbookFileWizardPage.open_error.message=Error occurred while opening SQL Scrapbook editor
-
diff --git a/plugins/org.eclipse.datatools.sqltools.sqlscrapbook/plugin.xml b/plugins/org.eclipse.datatools.sqltools.sqlscrapbook/plugin.xml
deleted file mode 100644
index 8f25b3a..0000000
--- a/plugins/org.eclipse.datatools.sqltools.sqlscrapbook/plugin.xml
+++ /dev/null
@@ -1,99 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<plugin
- id="org.eclipse.datatools.sqltools.sqlscrapbook"
- name="%pluginName"
- version="0.7.0"
- provider-name="%providerName"
- class="org.eclipse.datatools.sqltools.internal.sqlscrapbook.SqlscrapbookPlugin">
-
- <runtime>
- <library name="sqlscrapbook.jar">
- <export name="*"/>
- </library>
- </runtime>
- <requires>
- <import plugin="org.eclipse.datatools.sqltools.sqleditor"/>
- <import plugin="org.eclipse.jface.text"/>
- <import plugin="org.eclipse.ui"/>
- <import plugin="org.eclipse.core.resources"/>
- <import plugin="org.eclipse.core.runtime"/>
- <import plugin="org.eclipse.ui.editors"/>
- <import plugin="org.eclipse.ui.workbench.texteditor"/>
- <import plugin="org.eclipse.datatools.connectivity.core"/>
- <import plugin="org.eclipse.datatools.connectivity.core.ui"/>
- <import plugin="org.eclipse.datatools.connectivity.server.ui"/>
- <import plugin="org.eclipse.ui.ide"/>
- <import plugin="org.eclipse.datatools.modelbase.sql"/>
- </requires>
- <extension
- point="org.eclipse.ui.editors">
- <editor
- class="org.eclipse.datatools.sqltools.internal.sqlscrapbook.editor.SQLScrapbookEditor"
- contributorClass="org.eclipse.datatools.sqltools.sqleditor.internal.SQLEditorActionContributor"
- default="true"
- extensions="ddl,sql,sqlpage"
- icon="images/qrydoc.gif"
- id="org.eclipse.datatools.sqltools.internal.sqlscrapbook.editor.SQLScrapbookEditor"
- name="SQL Editor"/>
- </extension>
-
-
- <extension
- point="org.eclipse.ui.popupMenus">
-<!-- SQL Scrapbook Menu -->
- <viewerContribution
- targetID="org.eclipse.datatools.connectivity.server.ui.navigator.serverExplorer"
- id="org.eclipse.datatools.connectivity.server.ui.navigator.popupMenus.sqlscrapbook">
- <action
- label="%SQLScrapbookAction.title_UI_"
- class="org.eclipse.datatools.sqltools.internal.sqlscrapbook.actions.SQLScrapbookAction"
- menubarPath="additions"
- enablesFor="1"
- id="org.eclipse.datatools.sqltools.internal.sqlscrapbook.actions.popupMenus.sqlscrapbook">
- </action>
- <visibility>
- <objectClass
- name="org.eclipse.datatools.modelbase.sql.schema.Database">
- </objectClass>
- </visibility>
- </viewerContribution>
- </extension>
-
-<!-- Actions for the Server Explorer toobar -->
- <extension
- point="org.eclipse.ui.viewActions">
- <viewContribution
- targetID="org.eclipse.datatools.connectivity.server.ui.navigator.serverExplorer"
- id="org.eclipse.datatools.connectivity.server.ui.navigator.viewActions.sqlscrapbook">
- <action
- label="%SQLScrapbookAction.title_UI_"
- hoverIcon="images/qrydoc.gif"
- icon="images/qrydoc.gif"
- tooltip="%SQLScrapbookAction.title_UI_"
- class="org.eclipse.datatools.sqltools.internal.sqlscrapbook.actions.SQLScrapbookUIAction"
- menubarPath="basicActions"
- toolbarPath="basicActions"
- id="org.eclipse.datatools.sqltools.internal.sqlscrapbook.actions.scrapbook">
- </action>
- </viewContribution>
- </extension>
-
- <extension
- point="org.eclipse.ui.newWizards">
- <category
- name="%NewWizardCategoryName"
- id="org.eclipse.datatools.sql">
- </category>
- <wizard
- name="%NewSQLScrapbookPage.label"
- icon="images/qrydoc.gif"
- category="org.eclipse.datatools.sql"
- class="org.eclipse.datatools.sqltools.internal.sqlscrapbook.wizards.NewSQLScrapbookFileCreationWizard"
- id="org.eclipse.datatools.sqltools.internal.sqlscrapbook.wizards.NewSQLScrapbookFileCreationWizard">
- <description>
- %NewSQLScrapbookPage.description
- </description>
- </wizard>
- </extension>
-</plugin>
diff --git a/plugins/org.eclipse.datatools.sqltools.sqlscrapbook/src/org/eclipse/datatools/sqltools/internal/sqlscrapbook/SqlscrapbookPlugin.java b/plugins/org.eclipse.datatools.sqltools.sqlscrapbook/src/org/eclipse/datatools/sqltools/internal/sqlscrapbook/SqlscrapbookPlugin.java
deleted file mode 100644
index ab3b017..0000000
--- a/plugins/org.eclipse.datatools.sqltools.sqlscrapbook/src/org/eclipse/datatools/sqltools/internal/sqlscrapbook/SqlscrapbookPlugin.java
+++ /dev/null
@@ -1,138 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2004 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- * Exadel Inc - additional implementation
- *******************************************************************************/
-package org.eclipse.datatools.sqltools.internal.sqlscrapbook;
-
-import java.text.MessageFormat;
-import java.util.MissingResourceException;
-import java.util.ResourceBundle;
-
-import org.eclipse.core.resources.IWorkspace;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.datatools.sqltools.internal.sqlscrapbook.editor.SQLScrapbookDocumentProvider;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.ui.IWorkbenchPage;
-import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-import org.eclipse.ui.texteditor.IDocumentProvider;
-import org.osgi.framework.BundleContext;
-
-/**
- * The main plugin class to be used in the desktop.
- */
-public class SqlscrapbookPlugin extends AbstractUIPlugin {
- // The shared instance of this plugin class
- private static SqlscrapbookPlugin plugin;
- private IDocumentProvider documentProvider;
-
- /**
- * The constructor.
- */
- public SqlscrapbookPlugin() {
- super();
- plugin = this;
- }
-
- /**
- * Returns the shared instance.
- */
- public static SqlscrapbookPlugin getDefault() {
- return plugin;
- }
-
- /**
- * Returns the plugin's resource bundle,
- */
- public ResourceBundle getResourceBundle() {
- return Platform.getResourceBundle(getDefault().getBundle());
- }
-
- /**
- * Returns the string from the plugin's resource bundle,
- * or 'key' if not found.
- */
- public static String getResourceString(String key) {
- ResourceBundle bundle = SqlscrapbookPlugin.getDefault().getResourceBundle();
- try {
- return (bundle != null) ? bundle.getString(key) : key;
- } catch (MissingResourceException e) {
- return key;
- }
- }
-
- /**
- * Gets the string resource for a key and does one substitution.
- *
- * @param key
- * The key for the String
- * @param s1
- * the substitution
- * @return the new string after substitution
- */
- public String getString(String key, Object s1) {
- String resourceString = getResourceString( key );
- return MessageFormat.format(resourceString, new Object[] { s1 });
- }
-
- public static IWorkspace getWorkspace() {
- return ResourcesPlugin.getWorkspace();
- }
-
- public static IWorkbenchPage getActivePage() {
- return getDefault().internalGetActivePage();
- }
-
- public static IWorkbenchWindow getActiveWorkbenchWindow() {
- return getDefault().getWorkbench().getActiveWorkbenchWindow();
- }
-
- public static Shell getActiveWorkbenchShell() {
- IWorkbenchWindow window = getActiveWorkbenchWindow();
- if (window != null) {
- return window.getShell();
- }
- return null;
- }
-
- private IWorkbenchPage internalGetActivePage() {
- IWorkbenchWindow window = getWorkbench().getActiveWorkbenchWindow();
- if (window == null)
- return null;
- return getWorkbench().getActiveWorkbenchWindow().getActivePage();
- }
-
- public static String getPluginId() {
- return getDefault().getBundle().getSymbolicName();
- }
-
- public static void log(IStatus status) {
- getDefault().getLog().log(status);
- }
-
- public static void log(Throwable e) {
- log(new Status(IStatus.ERROR, getPluginId(), 1,
- getResourceString("SQLScrapbookPlugin.internal_error"), e)); //$NON-NLS-1$
- }
-
- public IDocumentProvider getSQLEditorDocumentProvider() {
- if (documentProvider == null)
- documentProvider = new SQLScrapbookDocumentProvider();
- return documentProvider;
- }
-
- public void start(BundleContext context) throws Exception {
- super.start(context);
- }
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.datatools.sqltools.sqlscrapbook/src/org/eclipse/datatools/sqltools/internal/sqlscrapbook/editor/SQLScrapbookDocumentProvider.java b/plugins/org.eclipse.datatools.sqltools.sqlscrapbook/src/org/eclipse/datatools/sqltools/internal/sqlscrapbook/editor/SQLScrapbookDocumentProvider.java
deleted file mode 100644
index cc2a507..0000000
--- a/plugins/org.eclipse.datatools.sqltools.sqlscrapbook/src/org/eclipse/datatools/sqltools/internal/sqlscrapbook/editor/SQLScrapbookDocumentProvider.java
+++ /dev/null
@@ -1,184 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- * Exadel Inc - additional implementation
- *******************************************************************************/
-package org.eclipse.datatools.sqltools.internal.sqlscrapbook.editor;
-
-import java.io.File;
-import java.util.HashMap;
-import java.util.Map;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.QualifiedName;
-import org.eclipse.datatools.connectivity.internal.core.connection.ConnectionInfo;
-import org.eclipse.datatools.sqltools.internal.sqlscrapbook.util.NodeSQLPage;
-import org.eclipse.datatools.sqltools.internal.sqlscrapbook.util.SQLUtility;
-import org.eclipse.datatools.sqltools.sqleditor.internal.SQLEditor;
-import org.eclipse.jface.text.Document;
-import org.eclipse.jface.text.IDocument;
-import org.eclipse.ui.IEditorInput;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.IFileEditorInput;
-import org.eclipse.ui.IViewPart;
-import org.eclipse.ui.IWorkbench;
-import org.eclipse.ui.IWorkbenchPage;
-import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.editors.text.FileDocumentProvider;
-
-public class SQLScrapbookDocumentProvider extends FileDocumentProvider {
-
- static private String SERVER_EXPLORER = "org.eclipse.datatools.connectivity.server.ui.navigator.serverExplorer";
-
- protected IDocument createDocument(Object element) throws CoreException {
-
- IDocument document = null;
- document = super.createDocument(element);
- ConnectionInfo connectionInfo = null;
-
- // Check if the Server Explorer view is showing. If not, show it.
- IWorkbench workbench = PlatformUI.getWorkbench();
- if (workbench != null) {
- IWorkbenchWindow workbenchWindow = workbench.getActiveWorkbenchWindow();
- if (workbenchWindow != null) {
- IWorkbenchPage workbenchPage = workbenchWindow.getActivePage();
- if (workbenchPage != null) {
- IViewPart viewServerExplorer = workbenchPage.findView(SERVER_EXPLORER);
- if (viewServerExplorer == null || viewServerExplorer.getSite() == null) {
- workbenchPage.showView(SERVER_EXPLORER);
- }
- }
- }
- }
-
- if (element instanceof IFileEditorInput){
- IFile fileResource = ((IFileEditorInput) element).getFile();
- NodeSQLPage nodeSQLPage = null;
- File fileXMLin = null;
- if (fileResource != null) fileXMLin = fileResource.getLocation().toFile();
- if (fileXMLin != null) nodeSQLPage = SQLUtility.getInputSQLPageXML(fileXMLin);
-
- if (nodeSQLPage != null){
- connectionInfo = SQLUtility.getConnectionInfo(nodeSQLPage.getNameConnection());
- if (element instanceof SQLScrapbookEditorInput){
- ((SQLScrapbookEditorInput)element).setConnectionInfo(connectionInfo);
- ((SQLScrapbookEditorInput)element).setStatementSQL(nodeSQLPage.getStatementSQL());
- }
-
- if (document != null) document.set(nodeSQLPage.getStatementSQL());
-
- // Save Persistent nameConnection for *.sqlpage
- if (fileResource != null){
- fileResource.setPersistentProperty(new QualifiedName("org.eclipse.datatools.sqltools.internal.sqlscrapbook", "nameConnection"),nodeSQLPage.getNameConnection());
- }
- }
-
- if ((nodeSQLPage == null || connectionInfo == null)){
- String nameConnection = null;
- if (fileResource != null){
- nameConnection = fileResource.getPersistentProperty(new QualifiedName("org.eclipse.datatools.sqltools.internal.sqlscrapbook", "nameConnection"));
- }
- if ((element instanceof SQLScrapbookEditorInput) && (nameConnection != null)){
- connectionInfo = SQLUtility.getConnectionInfo(nameConnection);
- ((SQLScrapbookEditorInput)element).setConnectionInfo(connectionInfo);
- }
- }
- }
-
- if (document == null) {
- document = new Document("");
- }
-
- // Attempt show Message Connection through SQLScrapbookEditorInput
- if (element instanceof SQLScrapbookEditorInput) ((SQLScrapbookEditorInput)element).showMessageConnection();
-
- return document;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.ui.texteditor.AbstractDocumentProvider#doSaveDocument(org.eclipse.core.runtime.IProgressMonitor, java.lang.Object, org.eclipse.jface.text.IDocument, boolean)
- * tau 21.03.2005
- */
- protected void doSaveDocument(IProgressMonitor monitor, Object element,
- IDocument document, boolean overwrite) throws CoreException {
-
- IDocument storageDocument = null;
- String statementSQL = document.get();
- if (statementSQL == null) statementSQL = "";
-
- String nameConnection = null;
- IFile fileResource = null;
- SQLEditor sqlEditor = null;
-
- if (nameConnection == null) {
- // get nameConnection from SQLEditor
- IEditorPart editor = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().findEditor((IEditorInput)element);
- if ((editor != null) && (editor instanceof SQLEditor)) {
- sqlEditor = (SQLEditor) editor;
- ConnectionInfo connectionInfo = sqlEditor.getConnectionInfo();
- if (connectionInfo != null) nameConnection = connectionInfo.getName();
- }
- }
-
- if (element instanceof IFileEditorInput) fileResource = ((IFileEditorInput) element).getFile();
-
- if (((nameConnection == null) && element instanceof SQLScrapbookEditorInput)) {
- // get nameConnection from SQLScrapbookEditorInput
- ConnectionInfo connectionInfo = ((SQLScrapbookEditorInput)element).getConnectionInfo();
- if (connectionInfo != null) nameConnection = connectionInfo.getName();
- }
-
- if ((nameConnection == null) && (fileResource != null) && !fileResource.getFileExtension().equalsIgnoreCase("sqlpage")) {
- // get nameConnection from PersistentProperty
- if (fileResource.exists()){
- nameConnection = fileResource.getPersistentProperty(new QualifiedName("org.eclipse.datatools.sqltools.internal.sqlscrapbook", "nameConnection"));
- }
-
- }
-
- if (nameConnection == null) nameConnection = "";
-
- if ( (fileResource != null) && fileResource.getFileExtension().equalsIgnoreCase("sqlpage")) {
- // Do xml document (*.sqlpage file) with only nameConnection and statementSQL
- Map map = new HashMap();
- map.put("nameConnection", nameConnection);
-
- String pageXML = SQLUtility.getOutputSQLPageXML(statementSQL, map);
- storageDocument = new Document(pageXML);
- }
-
- if ((nameConnection != null) && (fileResource != null) && !fileResource.getFileExtension().equalsIgnoreCase("sqlpage")){
- // Save PersistentProperty nameConnection for not *.sqlpage
- if (fileResource.exists()){
- fileResource.setPersistentProperty(new QualifiedName("org.eclipse.datatools.sqltools.internal.sqlscrapbook", "nameConnection"),nameConnection);
- }
- }
-
- if (storageDocument == null) storageDocument = document;
-
- super.doSaveDocument(monitor, element, storageDocument, overwrite);
-
- // tau 21.03.05
- // First attempt show Message Connection through SQLScrapbookEditorInput
- if (element instanceof SQLScrapbookEditorInput) ((SQLScrapbookEditorInput)element).showMessageConnection();
- // Second attempt show Message Connection through sqlEditor
- if (sqlEditor != null) sqlEditor.refreshConnectionStatus();
-
- }
-
-
-
-
-
-
-}
-
diff --git a/plugins/org.eclipse.datatools.sqltools.sqlscrapbook/src/org/eclipse/datatools/sqltools/internal/sqlscrapbook/editor/SQLScrapbookEditor.java b/plugins/org.eclipse.datatools.sqltools.sqlscrapbook/src/org/eclipse/datatools/sqltools/internal/sqlscrapbook/editor/SQLScrapbookEditor.java
deleted file mode 100644
index d10b01c..0000000
--- a/plugins/org.eclipse.datatools.sqltools.sqlscrapbook/src/org/eclipse/datatools/sqltools/internal/sqlscrapbook/editor/SQLScrapbookEditor.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 Exadel Inc 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Exadel Inc - initial API and implementation
- *******************************************************************************/
-package org.eclipse.datatools.sqltools.internal.sqlscrapbook.editor;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.datatools.connectivity.internal.core.connection.ConnectionInfo;
-import org.eclipse.datatools.sqltools.internal.sqlscrapbook.SqlscrapbookPlugin;
-import org.eclipse.datatools.sqltools.sqleditor.internal.SQLEditor;
-import org.eclipse.ui.IEditorInput;
-import org.eclipse.ui.IFileEditorInput;
-
-public class SQLScrapbookEditor extends SQLEditor {
-
- public SQLScrapbookEditor() {
- super();
- }
-
- protected void initializeEditor() {
- super.initializeEditor();
- setDocumentProvider(SqlscrapbookPlugin.getDefault().getSQLEditorDocumentProvider());
- }
-
- public void doSetInput(IEditorInput input) throws CoreException {
- SQLScrapbookEditorInput newInput = null;
- ConnectionInfo connectionInfo = null;
- if (input instanceof SQLScrapbookEditorInput) {
- newInput = (SQLScrapbookEditorInput) input;
- } else if (input instanceof IFileEditorInput) {
- newInput = new SQLScrapbookEditorInput(((IFileEditorInput) input).getFile());
- }
-
- if (newInput == null){
- super.doSetInput(input);
- } else {
- newInput.setEditorSite(this.getEditorSite());
- super.doSetInput(newInput);
- }
-
- }
-
-}
diff --git a/plugins/org.eclipse.datatools.sqltools.sqlscrapbook/src/org/eclipse/datatools/sqltools/internal/sqlscrapbook/editor/SQLScrapbookEditorInput.java b/plugins/org.eclipse.datatools.sqltools.sqlscrapbook/src/org/eclipse/datatools/sqltools/internal/sqlscrapbook/editor/SQLScrapbookEditorInput.java
deleted file mode 100644
index c9a6664..0000000
--- a/plugins/org.eclipse.datatools.sqltools.sqlscrapbook/src/org/eclipse/datatools/sqltools/internal/sqlscrapbook/editor/SQLScrapbookEditorInput.java
+++ /dev/null
@@ -1,147 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Exadel Inc - initial API and implementation
- *******************************************************************************/
-package org.eclipse.datatools.sqltools.internal.sqlscrapbook.editor;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.datatools.connectivity.internal.core.connection.ConnectionInfo;
-import org.eclipse.datatools.sqltools.internal.sqlscrapbook.views.execute.SQLScrapbookSelectConnectionAction;
-import org.eclipse.datatools.sqltools.sqleditor.internal.SQLEditorFileEditorInput;
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.util.IPropertyChangeListener;
-import org.eclipse.jface.util.PropertyChangeEvent;
-import org.eclipse.ui.IActionBars;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.IEditorSite;
-import org.eclipse.ui.IWorkbenchPage;
-import org.eclipse.ui.texteditor.AbstractDocumentProvider;
-import org.eclipse.ui.texteditor.ITextEditor;
-
-/**
- * File based editor input for SQL scrapbook.
- */
-public class SQLScrapbookEditorInput extends SQLEditorFileEditorInput implements
- IPropertyChangeListener {
-
- private String statementSQL;
-
- private IAction connectionAction;
-
- private IEditorSite editorSite;
-
- public SQLScrapbookEditorInput(IFile file) {
- super(file);
- }
-
- public SQLScrapbookEditorInput(IFile file, ConnectionInfo connectionInfo) {
- super(file);
- setConnectionInfo( connectionInfo );
- }
-
- public SQLScrapbookEditorInput(IFile file, String statementSQL) {
- super(file);
- this.statementSQL = statementSQL;
- }
-
- // tau 17.07.04
- public ConnectionInfo getConnectionInfo(boolean dialog) {
- ConnectionInfo connectionInfo = getConnectionInfo();
- if (connectionInfo == null && connectionAction != null && dialog) {
- connectionAction.run();
- }
- return connectionInfo;
- }
-
- public void setStatementSQL(String statementSQL) {
- this.statementSQL = statementSQL;
- }
-
- public String getStatementSQL() {
- return statementSQL;
- }
-
- /**
- * @return Returns the editorSite.
- */
- public IEditorSite getEditorSite() {
- return editorSite;
- }
-
- /**
- * @param editorSite
- * The editorSite to set.
- */
- public void setEditorSite(IEditorSite editorSite) {
- this.editorSite = editorSite;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jface.util.IPropertyChangeListener#propertyChange(org.eclipse.jface.util.PropertyChangeEvent)
- */
- public void propertyChange(PropertyChangeEvent event) {
-
- if (event.getProperty().equals(
- SQLScrapbookSelectConnectionAction.CONNECTION)) {
- ConnectionInfo connectionInfo = (ConnectionInfo) event.getNewValue();
- setConnectionInfo( connectionInfo );
- }
-
- // 19.07.04 tau
- IEditorPart editor = null;
- IWorkbenchPage page = editorSite.getPage();
-
- if (page != null) {
- editor = page.getActiveEditor();
- }
-
- if (editor != null && editor instanceof ITextEditor) {
- ((AbstractDocumentProvider) ((ITextEditor) editor).getDocumentProvider()).setCanSaveDocument(this);
- }
-
- showMessageConnection(); // 17.07.04
- }
-
- public void showMessageConnection() {
- IActionBars bars = editorSite.getActionBars();
- ConnectionInfo connectionInfo = getConnectionInfo();
- if (bars != null && connectionInfo != null) {
- bars.getStatusLineManager().setErrorMessage(null);
- bars.getStatusLineManager().setMessage(
- connectionInfo.getName()
- + " ("
- + connectionInfo.getDatabaseName()
- + ": "
- + connectionInfo.getURL()
- + ")");
- bars.updateActionBars();
- } else if (bars != null && connectionInfo == null) {
- bars.getStatusLineManager().setErrorMessage("No connection!");
- }
-
- }
-
- /**
- * @return Returns the setConnectionAction. tau 09.07.04
- */
- public IAction getConnectionAction() {
- return connectionAction;
- }
-
- /**
- * @param setConnectionAction
- * The setConnectionAction to set. tau 09.07.04
- */
- public void setConnectionAction(IAction setConnectionAction) {
- this.connectionAction = setConnectionAction;
- }
-
-}
diff --git a/plugins/org.eclipse.datatools.sqltools.sqlscrapbook/src/org/eclipse/datatools/sqltools/internal/sqlscrapbook/icons/executesql.gif b/plugins/org.eclipse.datatools.sqltools.sqlscrapbook/src/org/eclipse/datatools/sqltools/internal/sqlscrapbook/icons/executesql.gif
deleted file mode 100644
index 3379503..0000000
--- a/plugins/org.eclipse.datatools.sqltools.sqlscrapbook/src/org/eclipse/datatools/sqltools/internal/sqlscrapbook/icons/executesql.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.datatools.sqltools.sqlscrapbook/src/org/eclipse/datatools/sqltools/internal/sqlscrapbook/util/ExceptionHandler.java b/plugins/org.eclipse.datatools.sqltools.sqlscrapbook/src/org/eclipse/datatools/sqltools/internal/sqlscrapbook/util/ExceptionHandler.java
deleted file mode 100644
index d7c55be..0000000
--- a/plugins/org.eclipse.datatools.sqltools.sqlscrapbook/src/org/eclipse/datatools/sqltools/internal/sqlscrapbook/util/ExceptionHandler.java
+++ /dev/null
@@ -1,158 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2004 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- * Exadel Inc - additional implementation
- *******************************************************************************/
-package org.eclipse.datatools.sqltools.internal.sqlscrapbook.util;
-
-import java.io.StringWriter;
-import java.lang.reflect.InvocationTargetException;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.datatools.sqltools.internal.sqlscrapbook.SqlscrapbookPlugin;
-import org.eclipse.jface.dialogs.ErrorDialog;
-import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.swt.widgets.Shell;
-
-/**
- * The default exception handler shows an error dialog when one of its handle
- * methods is called. If the passed exception is a <code>CoreException</code>
- * an error dialog pops up showing the exception's status information. For a
- * <code>InvocationTargetException</code> a normal message dialog pops up
- * showing the exception's message. Additionally the exception is written to the
- * platform log.
- */
-public class ExceptionHandler {
-
- private static ExceptionHandler fgInstance = new ExceptionHandler();
-
- /**
- * Logs the given exception using the platform's logging mechanism. The
- * exception is logged as an error with the error code
- * <code>JavaStatusConstants.INTERNAL_ERROR</code>.
- */
- public static void log(Throwable t, String message) {
- SqlscrapbookPlugin.log(new Status(IStatus.ERROR, SqlscrapbookPlugin
- .getPluginId(), 1, message, t));
- }
-
- /**
- * Handles the given <code>CoreException</code>. The workbench shell is
- * used as a parent for the dialog window.
- *
- * @param e
- * the <code>CoreException</code> to be handled
- * @param title
- * the dialog window's window title
- * @param message
- * message to be displayed by the dialog window
- */
- public static void handle(CoreException e, String title, String message) {
- handle(e, SqlscrapbookPlugin.getActiveWorkbenchShell(), title, message);
- }
-
- /**
- * Handles the given <code>CoreException</code>.
- *
- * @param e
- * the <code>CoreException</code> to be handled
- * @param parent
- * the dialog window's parent shell
- * @param title
- * the dialog window's window title
- * @param message
- * message to be displayed by the dialog window
- */
- public static void handle(CoreException e, Shell parent, String title,
- String message) {
- fgInstance.perform(e, parent, title, message);
- }
-
- /**
- * Handles the given <code>InvocationTargetException</code>. The
- * workbench shell is used as a parent for the dialog window.
- *
- * @param e
- * the <code>InvocationTargetException</code> to be handled
- * @param title
- * the dialog window's window title
- * @param message
- * message to be displayed by the dialog window
- */
- public static void handle(InvocationTargetException e, String title,
- String message) {
- handle(e, SqlscrapbookPlugin.getActiveWorkbenchShell(), title, message);
- }
-
- /**
- * Handles the given <code>InvocationTargetException</code>.
- *
- * @param e
- * the <code>InvocationTargetException</code> to be handled
- * @param parent
- * the dialog window's parent shell
- * @param title
- * the dialog window's window title
- * @param message
- * message to be displayed by the dialog window
- */
- public static void handle(InvocationTargetException e, Shell parent,
- String title, String message) {
- fgInstance.perform(e, parent, title, message);
- }
-
- // ---- Hooks for subclasses to control exception handling
- // ------------------------------------
- protected void perform(CoreException e, Shell shell, String title,
- String message) {
- SqlscrapbookPlugin.log(e);
- IStatus status = e.getStatus();
- if (status != null) {
- ErrorDialog.openError(shell, title, message, status);
- } else {
- displayMessageDialog(e, e.getMessage(), shell, title, message);
- }
- }
-
- protected void perform(InvocationTargetException e, Shell shell,
- String title, String message) {
- Throwable target = e.getTargetException();
- if (target instanceof CoreException) {
- perform((CoreException) target, shell, title, message);
- } else {
- SqlscrapbookPlugin.log(e);
- if (e.getMessage() != null && e.getMessage().length() > 0) {
- displayMessageDialog(e, e.getMessage(), shell, title, message);
- } else {
- displayMessageDialog(e, target.getMessage(), shell, title,
- message);
- }
- }
- }
-
- // ---- Helper methods
- // -----------------------------------------------------------------------
- private void displayMessageDialog(Throwable t, String exceptionMessage,
- Shell shell, String title, String message) {
- StringWriter msg = new StringWriter();
- if (message != null) {
- msg.write(message);
- msg.write("\n\n"); //$NON-NLS-1$
- }
- if (exceptionMessage == null || exceptionMessage.length() == 0) {
- msg.write(SqlscrapbookPlugin
- .getResourceString("ExceptionDialog.seeErrorLogMessage")); //$NON-NLS-1$
- } else {
- msg.write(exceptionMessage);
- }
- MessageDialog.openError(shell, title, msg.toString());
- }
-}
diff --git a/plugins/org.eclipse.datatools.sqltools.sqlscrapbook/src/org/eclipse/datatools/sqltools/internal/sqlscrapbook/util/NodeSQLPage.java b/plugins/org.eclipse.datatools.sqltools.sqlscrapbook/src/org/eclipse/datatools/sqltools/internal/sqlscrapbook/util/NodeSQLPage.java
deleted file mode 100644
index d1b8822..0000000
--- a/plugins/org.eclipse.datatools.sqltools.sqlscrapbook/src/org/eclipse/datatools/sqltools/internal/sqlscrapbook/util/NodeSQLPage.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 Exadel Inc 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Exadel Inc - initial API and implementation
- *******************************************************************************/
-package org.eclipse.datatools.sqltools.internal.sqlscrapbook.util;
-
-public class NodeSQLPage {
- private String nameConnection;
- private String statementSQL;
-
- public String getStatementSQL() {
- return statementSQL;
- }
-
- void setStatementSQL(String statementSQL) {
- this.statementSQL = statementSQL;
- }
-
- public String getNameConnection() {
- return nameConnection;
- }
-
-
- void setNameConnection(String nameConnection) {
- this.nameConnection = nameConnection;
- }
-
-
-}
diff --git a/plugins/org.eclipse.datatools.sqltools.sqlscrapbook/src/org/eclipse/datatools/sqltools/internal/sqlscrapbook/util/SQLUtility.java b/plugins/org.eclipse.datatools.sqltools.sqlscrapbook/src/org/eclipse/datatools/sqltools/internal/sqlscrapbook/util/SQLUtility.java
deleted file mode 100644
index 75aaf5a..0000000
--- a/plugins/org.eclipse.datatools.sqltools.sqlscrapbook/src/org/eclipse/datatools/sqltools/internal/sqlscrapbook/util/SQLUtility.java
+++ /dev/null
@@ -1,265 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 Exadel Inc 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Exadel Inc - initial API and implementation
- *******************************************************************************/
-package org.eclipse.datatools.sqltools.internal.sqlscrapbook.util;
-
-import java.io.File;
-import java.io.IOException;
-import java.io.StringWriter;
-import java.util.Iterator;
-import java.util.Map;
-
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.parsers.FactoryConfigurationError;
-import javax.xml.parsers.ParserConfigurationException;
-import javax.xml.transform.OutputKeys;
-import javax.xml.transform.Transformer;
-import javax.xml.transform.TransformerConfigurationException;
-import javax.xml.transform.TransformerException;
-import javax.xml.transform.TransformerFactory;
-import javax.xml.transform.dom.DOMSource;
-import javax.xml.transform.stream.StreamResult;
-
-import org.eclipse.datatools.connectivity.core.internal.ui.explorer.virtual.IConnectionNode;
-import org.eclipse.datatools.connectivity.internal.core.connection.ConnectionInfo;
-import org.eclipse.datatools.connectivity.server.internal.ui.explorer.content.ServerExplorerConfiguration;
-import org.eclipse.datatools.connectivity.server.internal.ui.services.IServerExplorerContentService;
-import org.eclipse.datatools.connectivity.server.internal.ui.services.IServicesManager;
-import org.w3c.dom.Attr;
-import org.w3c.dom.DOMImplementation;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-import org.xml.sax.SAXException;
-
-public class SQLUtility {
-
- public static ConnectionInfo getConnectionInfo(String nameConnection) {
- IServerExplorerContentService service = IServicesManager.INSTANCE.getServerExplorerContentService();
-
- // Service is not yet initialized
- // TODO reconnect at later time
- if (service == null) {
- return null;
- }
-
- Object[] servers = service.getKnownServerNode().getChildrenArray();
- ConnectionInfo connection = null;
-
- for (int i = 0; i < servers.length; i++) {
- IConnectionNode node = (IConnectionNode) servers[i];
- ConnectionInfo info = node.getConnectionInfo();
-
- if (info.getName().equals(nameConnection)) {
- connection = node.getConnectionInfo();
- if (!node.isConnected()){
- //service.reconnectServer(new IConnectionNode[] { node });
- //service.connectServer(node);
- //node.setConnected(true);
- new ServerExplorerConfiguration().restoreConnectionInfo(node, node.getConnectionInfo());
-
- }
- break;
- }
-
- }
-
- if (connection == null) {
- // tau - get connectionWizard? - No. 20.03.2005 tau
- }
- return connection;
- }
-
- // 01.07.04 tau - add 16.03.2005
- public static ConnectionInfo getConnectionInfo(String userid, String url, String driver, String password) {
- IServerExplorerContentService service = IServicesManager.INSTANCE.getServerExplorerContentService();
- // Service is not yet initialized
- // TODO reconnect at later time
- if (service == null) {
- return null;
- }
- Object[] servers = service.getKnownServerNode().getChildrenArray();
- ConnectionInfo connection = null;
-
- for (int i = 0; i < servers.length; i++) {
- IConnectionNode node = (IConnectionNode) servers[i];
- ConnectionInfo info = node.getConnectionInfo();
-
- if (info.getUserName().equals(userid) &&
- info.getURL().equals(url) &&
- info.getDriverClassName().equals(driver)) {
-
- connection = node.getConnectionInfo();
- break;
- }
- }
-
- if (connection == null) {
- // tau - get connectionWizard? - No. 20.03.2005 tau
- }
- return connection;
- }
-
-
- public static String getOutputSQLPageXML(String inStatement, Map map) {
- // tau 27.06.04 06.07.04
-
- org.w3c.dom.Document doc = null;
- DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
- DocumentBuilder builder = null;
- try {
- builder = factory.newDocumentBuilder();
- } catch (ParserConfigurationException e1) {
- // TODO Auto-generated catch block
- e1.printStackTrace();
- }
- DOMImplementation impl = builder.getDOMImplementation();
- doc = impl.createDocument(null, "SQLPage", null);
-
- Element root = doc.getDocumentElement();
-
- Iterator itMap = map.entrySet().iterator();
- for (Iterator it = map.entrySet().iterator(); it.hasNext();) {
- Object element = it.next();
- if (element instanceof Map.Entry) {
- String key = (String) ((Map.Entry) element).getKey();
- String value = (String) ((Map.Entry) element).getValue();
- Attr attr = doc.createAttribute(key);
- attr.setValue(value);
- root.setAttributeNode(attr);
- }
- }
-
- /*
- String userid = "";
- String driver = "";
- String url = "";
- String password = "";
-
- if (rdbConnection != null) {
- userid = rdbConnection.getUserName();
- driver = rdbConnection.getDriverClassName();
- url = rdbConnection.getURL();
- password = rdbConnection.getPassword();
- }
-
- Attr attr = doc.createAttribute("userid");
- attr.setValue(userid);
- root.setAttributeNode(attr);
-
- attr = doc.createAttribute("driver");
- attr.setValue(driver);
- root.setAttributeNode(attr);
-
- attr = doc.createAttribute("url");
- attr.setValue(url);
- root.setAttributeNode(attr);
-
- attr = doc.createAttribute("password");
- attr.setValue(password);
- root.setAttributeNode(attr);
-
- */
-
- Element item = doc.createElement("Statement"); // Create element
-
- if (inStatement == null) inStatement = "";
- item.appendChild( doc.createCDATASection(inStatement) );
- root.appendChild( item );
-
- StringWriter stringOut = new StringWriter(); //Writer will be a String
-
-
- // Serialisation through Tranform. add tau 06.04.07
- DOMSource domSource = new DOMSource(doc);
-
- StreamResult streamResult = new StreamResult(stringOut);
-
- TransformerFactory tf = TransformerFactory.newInstance();
- Transformer serializer = null;
-
- try {
- serializer = tf.newTransformer();
- } catch (TransformerConfigurationException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
- }
- //serializer.setOutputProperty(OutputKeys.ENCODING,"ISO-8859-1");
- serializer.setOutputProperty(OutputKeys.INDENT,"yes");
-
- try {
- serializer.transform(domSource, streamResult);
- } catch (TransformerException e2) {
- // TODO Auto-generated catch block
- e2.printStackTrace();
- }
-
- return stringOut.toString();
- }
-
- public static NodeSQLPage getInputSQLPageXML(File fileXMLin) {
- org.w3c.dom.Document xmlDocument = null;
- NodeSQLPage nodeSQLPage = null;
-
- try {
- DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
- DocumentBuilder builder = factory.newDocumentBuilder();
-
- xmlDocument = builder.parse(fileXMLin);
-
- Element xmlElement = xmlDocument.getDocumentElement();
-
- String sQLPage = xmlElement.getNodeName(); // add tau 16.03.2005
- if (!xmlElement.getNodeName().equals("SQLPage")){
- return null;
- }
-
- NodeSQLPage new_nodeSQLPage = new NodeSQLPage();
- new_nodeSQLPage.setNameConnection(xmlElement.getAttribute("nameConnection"));
-
- NodeList nodeList = xmlElement.getChildNodes();
- for (int i = 0; i < nodeList.getLength(); i++) {
- Node node = nodeList.item(i);
- if (node.getNodeType() == Node.ELEMENT_NODE &&
- node.getNodeName().equals("Statement")) {
- Element statementElement = (Element) node;
- NodeList statementNodeList = statementElement.getChildNodes();
- for (int j = 0; j < statementNodeList.getLength(); j++) {
- Node nodeSQL = statementNodeList.item(j);
- if (nodeSQL.getNodeType() == Node.CDATA_SECTION_NODE) {
- new_nodeSQLPage.setStatementSQL(nodeSQL.getNodeValue());
- break;
- }
- }
- break;
- }
- }
-
- nodeSQLPage = new_nodeSQLPage;
-
- } catch (FactoryConfigurationError e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
- } catch (ParserConfigurationException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
- } catch (SAXException e) {
- //e.printStackTrace(); tau 05.07.04
- } catch (IOException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
- }
-
- return nodeSQLPage;
-
- }
-
-}
diff --git a/plugins/org.eclipse.datatools.sqltools.sqlscrapbook/src/org/eclipse/datatools/sqltools/internal/sqlscrapbook/views/execute/SQLScrapbookSelectConnectionAction.java b/plugins/org.eclipse.datatools.sqltools.sqlscrapbook/src/org/eclipse/datatools/sqltools/internal/sqlscrapbook/views/execute/SQLScrapbookSelectConnectionAction.java
deleted file mode 100644
index 3ff5a26..0000000
--- a/plugins/org.eclipse.datatools.sqltools.sqlscrapbook/src/org/eclipse/datatools/sqltools/internal/sqlscrapbook/views/execute/SQLScrapbookSelectConnectionAction.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Exadel Inc - initial API and implementation
- *******************************************************************************/
-package org.eclipse.datatools.sqltools.internal.sqlscrapbook.views.execute;
-
-import org.eclipse.datatools.connectivity.core.internal.ui.explorer.virtual.IConnectionNode;
-import org.eclipse.datatools.connectivity.internal.core.connection.ConnectionInfo;
-import org.eclipse.datatools.connectivity.server.internal.ui.services.IConnectedServerDialog;
-import org.eclipse.datatools.connectivity.server.internal.ui.services.IServicesManager;
-import org.eclipse.datatools.sqltools.internal.sqlscrapbook.SqlscrapbookPlugin;
-import org.eclipse.jface.action.Action;
-import org.eclipse.jface.window.Window;
-
-/**
- * Select connection for SQL scrapbook editor from list of available connections.
- */
-public class SQLScrapbookSelectConnectionAction extends Action {
-
- public static final String CONNECTION = "Connection"; //$NON-NLS-1$
-
- private ConnectionInfo connectionInfo = null;
-
- public SQLScrapbookSelectConnectionAction() {
- super(SqlscrapbookPlugin.getResourceString("_UI_MENU_SELECT_CONNECTION"));
- }
-
- public void setConnectionInfo(ConnectionInfo connectionInfo) {
- this.connectionInfo = connectionInfo;
- }
-
- public void run() {
- IConnectedServerDialog dialog = IServicesManager.INSTANCE.getConnectedServerDialog();
- int result = dialog.open();
- if (result == Window.OK) {
- IConnectionNode node = dialog.getUserSelection();
- if (node != null) {
- ConnectionInfo newConnectionInfo = node.getConnectionInfo();
- if (newConnectionInfo != null) {
- firePropertyChange(CONNECTION, connectionInfo, newConnectionInfo);
- connectionInfo = newConnectionInfo;
- }
- }
- }
- }
-
-}
diff --git a/plugins/org.eclipse.datatools.sqltools.sqlscrapbook/src/org/eclipse/datatools/sqltools/internal/sqlscrapbook/wizards/NewSQLScrapbookFileCreationWizard.java b/plugins/org.eclipse.datatools.sqltools.sqlscrapbook/src/org/eclipse/datatools/sqltools/internal/sqlscrapbook/wizards/NewSQLScrapbookFileCreationWizard.java
deleted file mode 100644
index 67c6c83..0000000
--- a/plugins/org.eclipse.datatools.sqltools.sqlscrapbook/src/org/eclipse/datatools/sqltools/internal/sqlscrapbook/wizards/NewSQLScrapbookFileCreationWizard.java
+++ /dev/null
@@ -1,73 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2004 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Exadel Inc - initial API and implementation
- *******************************************************************************/
-package org.eclipse.datatools.sqltools.internal.sqlscrapbook.wizards;
-
-import org.eclipse.datatools.connectivity.internal.core.connection.ConnectionInfo;
-import org.eclipse.datatools.sqltools.internal.sqlscrapbook.SqlscrapbookPlugin;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.jface.wizard.Wizard;
-import org.eclipse.ui.INewWizard;
-import org.eclipse.ui.IWorkbench;
-
-/**
- * Creates a new snippet page
- */
-public class NewSQLScrapbookFileCreationWizard extends Wizard implements
- INewWizard {
-
- private NewSQLScrapbookFileWizardPage fPage;
-
- private IStructuredSelection fSelection;
-
- private ConnectionInfo connectionInfo; // tau 04.07.04
-
- public NewSQLScrapbookFileCreationWizard() {
- setNeedsProgressMonitor(true);
- setWindowTitle(SqlscrapbookPlugin
- .getResourceString("NewSQLScrapbookFileCreationWizard.title")); //$NON-NLS-1$
- }
-
- /*
- * @see Wizard#addPages
- */
- public void addPages() {
- super.addPages();
- if (fSelection == null) {
- fSelection = StructuredSelection.EMPTY;
- }
- fPage = new NewSQLScrapbookFileWizardPage(fSelection);
- addPage(fPage);
- }
-
- /*
- * @see Wizard#performFinish
- */
- public boolean performFinish() {
- return fPage.finish(connectionInfo); // tau 04.07.04
- }
-
- /*
- * @see org.eclipse.ui.IWorkbenchWizard#init
- */
- public void init(IWorkbench workbench, IStructuredSelection selection) {
- fSelection = selection;
- // setDefaultPageImageDescriptor(JavaPluginImages.DESC_WIZBAN_NEWSCRAPPAGE);
- }
-
- /**
- * @param connection
- * The connection to set. tau 04.07.04
- */
- public void setConnectionInfo(ConnectionInfo connectionInfo) {
- this.connectionInfo = connectionInfo;
- }
-}
diff --git a/plugins/org.eclipse.datatools.sqltools.sqlscrapbook/src/org/eclipse/datatools/sqltools/internal/sqlscrapbook/wizards/NewSQLScrapbookFileWizardPage.java b/plugins/org.eclipse.datatools.sqltools.sqlscrapbook/src/org/eclipse/datatools/sqltools/internal/sqlscrapbook/wizards/NewSQLScrapbookFileWizardPage.java
deleted file mode 100644
index 5712839..0000000
--- a/plugins/org.eclipse.datatools.sqltools.sqlscrapbook/src/org/eclipse/datatools/sqltools/internal/sqlscrapbook/wizards/NewSQLScrapbookFileWizardPage.java
+++ /dev/null
@@ -1,141 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2004 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Exadel Inc - initial API and implementation
- *******************************************************************************/
-package org.eclipse.datatools.sqltools.internal.sqlscrapbook.wizards;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IWorkspaceRoot;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.datatools.connectivity.internal.core.connection.ConnectionInfo;
-import org.eclipse.datatools.sqltools.internal.sqlscrapbook.SqlscrapbookPlugin;
-import org.eclipse.datatools.sqltools.internal.sqlscrapbook.editor.SQLScrapbookEditorInput;
-import org.eclipse.datatools.sqltools.internal.sqlscrapbook.util.ExceptionHandler;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.ui.IWorkbenchPage;
-import org.eclipse.ui.IWorkbenchPart;
-import org.eclipse.ui.PartInitException;
-import org.eclipse.ui.dialogs.WizardNewFileCreationPage;
-import org.eclipse.ui.help.WorkbenchHelp;
-import org.eclipse.ui.part.ISetSelectionTarget;
-
-/**
- * Page to create a new SQL scrapbook file.
- */
-public class NewSQLScrapbookFileWizardPage extends WizardNewFileCreationPage {
-
- private static final String fgDefaultExtension= ".sqlpage"; //$NON-NLS-1$
-
- public NewSQLScrapbookFileWizardPage(IStructuredSelection selection) {
- super("createScrapBookPage", selection); //$NON-NLS-1$
- setTitle(SqlscrapbookPlugin.getResourceString("NewSQLScrapbookFileWizardPage.title")); //$NON-NLS-1$
- }
-
- public boolean finish(ConnectionInfo connectionInfo) {
- // add extension if non is provided
- String fileName= getFileName();
- if (fileName != null && !fileName.endsWith(fgDefaultExtension)) {
- setFileName(fileName + fgDefaultExtension);
- }
-
- boolean retValue= super.validatePage();
-
- final IFile file= createNewFile();
- if (retValue && file != null) {
- Shell shell= getShell();
- IWorkbenchPage page= SqlscrapbookPlugin.getActivePage();
- if (shell == null || page == null) {
- return true;
- }
- final IWorkbenchPart focusPart= page.getActivePart();
- if (focusPart instanceof ISetSelectionTarget) {
- shell.getDisplay().asyncExec(new Runnable() {
- public void run() {
- ISelection selection= new StructuredSelection(file);
- ((ISetSelectionTarget) focusPart).selectReveal(selection);
- }
- });
- }
-
-
- try {
- //IDE.openEditor(page, file, true); // tau 04.07.04
- // tau 04.07.04, 17.07.04
-
- // add tau 10.03.2005
- SQLScrapbookEditorInput editorInput = new SQLScrapbookEditorInput(file, connectionInfo);
-
- /*
- SqlscrapbookPlugin.getDefault().getWorkbench().getActiveWorkbenchWindow().getActivePage().openEditor(editorInput,
- "org.eclipse.datatools.sqltools.internal.sqlscrapbook.views.SQLScrapbookEditor");
- */
-
- SqlscrapbookPlugin.getDefault().getWorkbench().getActiveWorkbenchWindow().getActivePage().openEditor(editorInput,
- "org.eclipse.datatools.sqltools.internal.sqlscrapbook.editor.SQLScrapbookEditor");
-
- return true;
- } catch (PartInitException e) {
- ExceptionHandler.handle(e, shell, SqlscrapbookPlugin.getResourceString("NewSQLScrapbookFileWizardPage.open_error.message"), e.getMessage()); //$NON-NLS-1$
- }
-
- }
- return false;
- }
-
- /**
- * @see WizardNewFileCreationPage#validatePage
- */
- protected boolean validatePage() {
- // check whether file with extension doesn't exist
- boolean valid= super.validatePage();
- if (!valid)
- return false;
-
- IWorkspaceRoot workspaceRoot= SqlscrapbookPlugin.getWorkspace().getRoot();
- IPath containerPath= getContainerFullPath();
- /*if (containerPath != null && containerPath.segmentCount() > 0) {
- IProject project= workspaceRoot.getProject(containerPath.segment(0));
- try {
- if (!project.hasNature(JavaCore.NATURE_ID)) {
- setErrorMessage(SQLScrapbookMessages.getString("NewSQLScrapbookFileWizardPage.error.OnlyInJavaProject")); //$NON-NLS-1$
- return false;
- }
- } catch (CoreException e) {
- SqlscrapbookPlugin.log(e.getStatus());
- }
- }*/
-
- String fileName= getFileName();
- if (fileName != null && !fileName.endsWith(fgDefaultExtension)) {
- fileName= fileName + fgDefaultExtension;
- IPath path= getContainerFullPath();
-
- if (path != null && workspaceRoot.exists(path.append(fileName))) {
- setErrorMessage(SqlscrapbookPlugin.getResourceString("NewSQLScrapbookFileWizardPage.error.AlreadyExists")); //$NON-NLS-1$
- return false;
- }
- }
- return true;
- }
-
- /*
- * @see WizardNewFileCreationPage#createControl(Composite)
- */
- public void createControl(Composite parent) {
- super.createControl(parent);
- WorkbenchHelp.setHelp(getControl(), "new_sqlscrapbook_wizard_page_context");
- }
-
-}
-
-
