|
From: <wi...@us...> - 2011-04-20 19:55:06
|
Revision: 6240
http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=6240&view=rev
Author: wis775
Date: 2011-04-20 19:54:58 +0000 (Wed, 20 Apr 2011)
Log Message:
-----------
Upgrade from commons-lang:1.0 to commons-lang:2.6.
commons-lang:2.6 contains some methods, that are identical to the Squirrel specific StringUtilities. These methods are removed.
Now, some modules have a new compile dependency to commons-lang. Thats why commons-lang are defined within the dependencyManagement section.
Modified Paths:
--------------
trunk/sql12/app/pom.xml
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/Application.java
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/HelpViewerWindow.java
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/db/aliasproperties/AddDriverPropertyDialog.java
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/session/CatalogsPanel.java
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/preferences/GeneralPreferencesPanel.java
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/preferences/UpdatePreferencesPanel.java
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/objecttree/ObjectTreeCellRenderer.java
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/properties/SessionObjectTreePropertiesPanel.java
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/update/UpdateUtilImpl.java
trunk/sql12/fw/pom.xml
trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/datasetviewer/cellcomponent/FloatingPointBase.java
trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/datasetviewer/cellcomponent/whereClause/AbstractWhereClausePart.java
trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/datasetviewer/cellcomponent/whereClause/IsNullWhereClausePart.java
trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/dialects/DB2DialectExt.java
trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/dialects/DialectUtils.java
trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/dialects/OptionalSqlClause.java
trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/gui/debug/DebugEventListener.java
trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/sql/DatabaseObjectInfo.java
trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/sql/SQLConnection.java
trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/util/StringUtilities.java
trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/util/Utilities.java
trunk/sql12/fw/src/test/java/net/sourceforge/squirrel_sql/fw/util/StringUtilitiesTest.java
trunk/sql12/plugins/i18n/pom.xml
trunk/sql12/plugins/i18n/src/main/java/net/sourceforge/squirrel_sql/plugins/i18n/TranslatorsController.java
trunk/sql12/plugins/pom.xml
trunk/sql12/plugins/refactoring/pom.xml
trunk/sql12/plugins/refactoring/src/main/java/net/sourceforge/squirrel_sql/plugins/refactoring/DBUtil.java
trunk/sql12/pom.xml
Modified: trunk/sql12/app/pom.xml
===================================================================
--- trunk/sql12/app/pom.xml 2011-04-20 05:08:41 UTC (rev 6239)
+++ trunk/sql12/app/pom.xml 2011-04-20 19:54:58 UTC (rev 6240)
@@ -82,6 +82,10 @@
<artifactId>gsbase</artifactId>
</dependency>
<dependency>
+ <groupId>commons-lang</groupId>
+ <artifactId>commons-lang</artifactId>
+ </dependency>
+ <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
</dependency>
Modified: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/Application.java
===================================================================
--- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/Application.java 2011-04-20 05:08:41 UTC (rev 6239)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/Application.java 2011-04-20 19:54:58 UTC (rev 6240)
@@ -39,6 +39,8 @@
import javax.swing.UIManager;
import javax.swing.plaf.metal.MetalLookAndFeel;
+import org.apache.commons.lang.StringUtils;
+
import net.sourceforge.squirrel_sql.client.action.ActionCollection;
import net.sourceforge.squirrel_sql.client.gui.FileViewerFactory;
import net.sourceforge.squirrel_sql.client.gui.SquirrelSplashScreen;
@@ -284,7 +286,7 @@
private Locale constructPreferredLocale(SquirrelPreferences prefs)
{
String langCountryPair = prefs.getPreferredLocale();
- if (StringUtilities.isEmpty(langCountryPair))
+ if (StringUtils.isEmpty(langCountryPair))
{
langCountryPair = "en_US";
}
Modified: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/HelpViewerWindow.java
===================================================================
--- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/HelpViewerWindow.java 2011-04-20 05:08:41 UTC (rev 6239)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/HelpViewerWindow.java 2011-04-20 19:54:58 UTC (rev 6240)
@@ -58,11 +58,12 @@
import net.sourceforge.squirrel_sql.fw.util.FileWrapperFactoryImpl;
import net.sourceforge.squirrel_sql.fw.util.StringManager;
import net.sourceforge.squirrel_sql.fw.util.StringManagerFactory;
-import net.sourceforge.squirrel_sql.fw.util.StringUtilities;
import net.sourceforge.squirrel_sql.fw.util.Utilities;
import net.sourceforge.squirrel_sql.fw.util.log.ILogger;
import net.sourceforge.squirrel_sql.fw.util.log.LoggerController;
+import org.apache.commons.lang.StringUtils;
+
/**
* This window shows the SQuirreL Help files.
*
@@ -529,7 +530,7 @@
if (docURL != null)
{
String docTitle = dn.toString();
- if (StringUtilities.isEmpty(docTitle))
+ if (StringUtils.isEmpty(docTitle))
{
docTitle = docURL.toExternalForm();
}
Modified: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/db/aliasproperties/AddDriverPropertyDialog.java
===================================================================
--- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/db/aliasproperties/AddDriverPropertyDialog.java 2011-04-20 05:08:41 UTC (rev 6239)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/db/aliasproperties/AddDriverPropertyDialog.java 2011-04-20 19:54:58 UTC (rev 6240)
@@ -33,8 +33,9 @@
import net.sourceforge.squirrel_sql.fw.util.StringManager;
import net.sourceforge.squirrel_sql.fw.util.StringManagerFactory;
-import net.sourceforge.squirrel_sql.fw.util.StringUtilities;
+import org.apache.commons.lang.StringUtils;
+
/**
* Dialog that gets displayed when a user chooses to add a driver property to the table.
*/
@@ -104,7 +105,7 @@
public void actionPerformed(ActionEvent arg0)
{
String name = propertyNameTF.getText();
- if (!StringUtilities.isEmpty(name))
+ if (!StringUtils.isEmpty(name))
{
String value = propertyValueTF.getText();
String desc = propertyDescriptionTF.getText();
Modified: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/session/CatalogsPanel.java
===================================================================
--- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/session/CatalogsPanel.java 2011-04-20 05:08:41 UTC (rev 6239)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/session/CatalogsPanel.java 2011-04-20 19:54:58 UTC (rev 6240)
@@ -19,10 +19,11 @@
import net.sourceforge.squirrel_sql.fw.sql.ISQLConnection;
import net.sourceforge.squirrel_sql.fw.util.StringManager;
import net.sourceforge.squirrel_sql.fw.util.StringManagerFactory;
-import net.sourceforge.squirrel_sql.fw.util.StringUtilities;
import net.sourceforge.squirrel_sql.fw.util.log.ILogger;
import net.sourceforge.squirrel_sql.fw.util.log.LoggerController;
+import org.apache.commons.lang.StringUtils;
+
public class CatalogsPanel extends JPanel
{
/** Internationalized strings for this class. */
@@ -66,7 +67,7 @@
if (_catalogsCmb != null)
{
final ISQLConnection conn = _session.getSQLConnection();
- if (!StringUtilities.areStringsEqual(conn.getCatalog(), _catalogsCmb.getSelectedCatalog()))
+ if (!StringUtils.equals(conn.getCatalog(), _catalogsCmb.getSelectedCatalog()))
{
_catalogsCmb.setSelectedCatalog(conn.getCatalog());
}
Modified: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/preferences/GeneralPreferencesPanel.java
===================================================================
--- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/preferences/GeneralPreferencesPanel.java 2011-04-20 05:08:41 UTC (rev 6239)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/preferences/GeneralPreferencesPanel.java 2011-04-20 19:54:58 UTC (rev 6240)
@@ -28,6 +28,8 @@
import javax.swing.*;
import javax.swing.border.EmptyBorder;
+import org.apache.commons.lang.StringUtils;
+
import net.sourceforge.squirrel_sql.client.ApplicationArguments;
import net.sourceforge.squirrel_sql.client.IApplication;
import net.sourceforge.squirrel_sql.client.util.ApplicationFiles;
@@ -177,7 +179,7 @@
_selectOnRightMouseClick.setSelected(prefs.getSelectOnRightMouseClick());
_showPleaseWaitDialog.setSelected(prefs.getShowPleaseWaitDialog());
String preferredLocalString = prefs.getPreferredLocale();
- if (StringUtilities.isEmpty(preferredLocalString))
+ if (StringUtils.isEmpty(preferredLocalString))
{
preferredLocalString = "en_US";
}
Modified: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/preferences/UpdatePreferencesPanel.java
===================================================================
--- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/preferences/UpdatePreferencesPanel.java 2011-04-20 05:08:41 UTC (rev 6239)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/preferences/UpdatePreferencesPanel.java 2011-04-20 19:54:58 UTC (rev 6240)
@@ -50,8 +50,9 @@
import net.sourceforge.squirrel_sql.client.update.UpdateUtilImpl;
import net.sourceforge.squirrel_sql.fw.util.StringManager;
import net.sourceforge.squirrel_sql.fw.util.StringManagerFactory;
-import net.sourceforge.squirrel_sql.fw.util.StringUtilities;
+import org.apache.commons.lang.StringUtils;
+
public class UpdatePreferencesPanel extends JPanel
{
private static final Color CONNECTION_FAILURE_COLOR = Color.RED;
@@ -533,7 +534,7 @@
String portStr = _updateServerPort.getText();
StringBuilder tmp = new StringBuilder("http://");
tmp.append(_updateServerName.getText());
- if (!StringUtilities.isEmpty(portStr))
+ if (!StringUtils.isEmpty(portStr))
{
tmp.append(":");
tmp.append(_updateServerPort.getText());
@@ -647,7 +648,7 @@
try
{
int port = 80;
- if (!StringUtilities.isEmpty(portString))
+ if (!StringUtils.isEmpty(portString))
{
port = Integer.parseInt(_updateServerPort.getText());
}
Modified: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/objecttree/ObjectTreeCellRenderer.java
===================================================================
--- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/objecttree/ObjectTreeCellRenderer.java 2011-04-20 05:08:41 UTC (rev 6239)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/objecttree/ObjectTreeCellRenderer.java 2011-04-20 19:54:58 UTC (rev 6240)
@@ -7,6 +7,9 @@
import javax.swing.tree.DefaultTreeCellRenderer;
import javax.swing.*;
+
+import org.apache.commons.lang.StringUtils;
+
import java.awt.*;
import java.beans.PropertyChangeEvent;
import java.beans.PropertyChangeListener;
@@ -62,12 +65,12 @@
String filterhint = "";
- if(false == StringUtilities.isEmpty(objectFilterInclude))
+ if(false == StringUtils.isEmpty(objectFilterInclude))
{
filterhint += "Inc:" + objectFilterInclude;
}
- if(false == StringUtilities.isEmpty(objectFilterExclude))
+ if(false == StringUtils.isEmpty(objectFilterExclude))
{
if(0 == filterhint.length())
{
Modified: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/properties/SessionObjectTreePropertiesPanel.java
===================================================================
--- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/properties/SessionObjectTreePropertiesPanel.java 2011-04-20 05:08:41 UTC (rev 6239)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/properties/SessionObjectTreePropertiesPanel.java 2011-04-20 19:54:58 UTC (rev 6240)
@@ -40,8 +40,9 @@
import net.sourceforge.squirrel_sql.fw.gui.MultipleLineLabel;
import net.sourceforge.squirrel_sql.fw.util.StringManager;
import net.sourceforge.squirrel_sql.fw.util.StringManagerFactory;
-import net.sourceforge.squirrel_sql.fw.util.StringUtilities;
+import org.apache.commons.lang.StringUtils;
+
/**
* This panel allows the user to tailor object tree settings for a session.
*
@@ -244,13 +245,13 @@
oldLoadSchemasCatalogs != newLoadSchemasCatalogs ||
oldShowRowCount != newShowRowCount ||
- !StringUtilities.areStringsEqual(oldCatalogFilterInclude, newCatalogFilterInclude) ||
- !StringUtilities.areStringsEqual(oldSchemaFilterInclude, newSchemaFilterInclude) ||
- !StringUtilities.areStringsEqual(oldObjectFilterInclude, newObjectFilterInclude) ||
+ !StringUtils.equals(oldCatalogFilterInclude, newCatalogFilterInclude) ||
+ !StringUtils.equals(oldSchemaFilterInclude, newSchemaFilterInclude) ||
+ !StringUtils.equals(oldObjectFilterInclude, newObjectFilterInclude) ||
- !StringUtilities.areStringsEqual(oldCatalogFilterExclude, newCatalogFilterExclude) ||
- !StringUtilities.areStringsEqual(oldSchemaFilterExclude, newSchemaFilterExclude) ||
- !StringUtilities.areStringsEqual(oldObjectFilterExclude, newObjectFilterExclude)
+ !StringUtils.equals(oldCatalogFilterExclude, newCatalogFilterExclude) ||
+ !StringUtils.equals(oldSchemaFilterExclude, newSchemaFilterExclude) ||
+ !StringUtils.equals(oldObjectFilterExclude, newObjectFilterExclude)
)
{
_objectTreeRefreshNeeded = true;
Modified: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/update/UpdateUtilImpl.java
===================================================================
--- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/update/UpdateUtilImpl.java 2011-04-20 05:08:41 UTC (rev 6239)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/update/UpdateUtilImpl.java 2011-04-20 19:54:58 UTC (rev 6240)
@@ -56,10 +56,11 @@
import net.sourceforge.squirrel_sql.fw.util.IOUtilities;
import net.sourceforge.squirrel_sql.fw.util.IOUtilitiesImpl;
import net.sourceforge.squirrel_sql.fw.util.IProxySettings;
-import net.sourceforge.squirrel_sql.fw.util.StringUtilities;
import net.sourceforge.squirrel_sql.fw.util.log.ILogger;
import net.sourceforge.squirrel_sql.fw.util.log.LoggerController;
+import org.apache.commons.lang.StringUtils;
+
/**
* Low-level utility methods for the UpdateController. Among other things this class provides file locations
* for important directories that are needed for backup/restore, installation/removal of updates and existing
@@ -308,7 +309,7 @@
public void moveFiles(FileWrapper fromDir, String filePattern, boolean matchPattern, FileWrapper toDir)
throws FileNotFoundException, IOException
{
- if (StringUtilities.isEmpty(filePattern)) {
+ if (StringUtils.isEmpty(filePattern)) {
throw new IllegalArgumentException("filePattern arg cannot be empty or null");
}
if (!fromDir.isDirectory()) { throw new IllegalArgumentException("Expected fromDir("
@@ -355,7 +356,7 @@
public void copyDir(FileWrapper fromDir, String filePattern, boolean matchPattern, FileWrapper toDir)
throws FileNotFoundException, IOException
{
- if (StringUtilities.isEmpty(filePattern)) {
+ if (StringUtils.isEmpty(filePattern)) {
throw new IllegalArgumentException("filePattern arg cannot be empty or null");
}
verifyDirectory(fromDir, toDir);
Modified: trunk/sql12/fw/pom.xml
===================================================================
--- trunk/sql12/fw/pom.xml 2011-04-20 05:08:41 UTC (rev 6239)
+++ trunk/sql12/fw/pom.xml 2011-04-20 19:54:58 UTC (rev 6240)
@@ -102,7 +102,6 @@
<dependency>
<groupId>commons-lang</groupId>
<artifactId>commons-lang</artifactId>
- <version>1.0</version>
</dependency>
<dependency>
<groupId>commons-logging</groupId>
Modified: trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/datasetviewer/cellcomponent/FloatingPointBase.java
===================================================================
--- trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/datasetviewer/cellcomponent/FloatingPointBase.java 2011-04-20 05:08:41 UTC (rev 6239)
+++ trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/datasetviewer/cellcomponent/FloatingPointBase.java 2011-04-20 19:54:58 UTC (rev 6240)
@@ -3,17 +3,13 @@
import java.awt.GridBagConstraints;
import java.awt.GridBagLayout;
import java.awt.Insets;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
import java.awt.event.FocusEvent;
import java.awt.event.FocusListener;
import java.text.NumberFormat;
import javax.swing.BorderFactory;
import javax.swing.ButtonGroup;
-import javax.swing.JLabel;
import javax.swing.JRadioButton;
-import javax.swing.JTextField;
import javax.swing.event.ChangeEvent;
import javax.swing.event.ChangeListener;
@@ -21,8 +17,9 @@
import net.sourceforge.squirrel_sql.fw.gui.OkJPanel;
import net.sourceforge.squirrel_sql.fw.util.StringManager;
import net.sourceforge.squirrel_sql.fw.util.StringManagerFactory;
-import net.sourceforge.squirrel_sql.fw.util.StringUtilities;
+import org.apache.commons.lang.StringUtils;
+
public abstract class FloatingPointBase extends BaseDataTypeComponent
{
private static final StringManager s_stringMgr =
@@ -105,7 +102,7 @@
maximumFractionDigits = 5; // by default use 5
String maximumFractionDigitsString = DTProperties.get(DataTypeBigDecimal.class.getName(), "maximumFractionDigits");
- if (StringUtilities.isEmpty(maximumFractionDigitsString) == false)
+ if (StringUtils.isEmpty(maximumFractionDigitsString) == false)
{
maximumFractionDigits =Integer.valueOf(maximumFractionDigitsString);
}
Modified: trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/datasetviewer/cellcomponent/whereClause/AbstractWhereClausePart.java
===================================================================
--- trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/datasetviewer/cellcomponent/whereClause/AbstractWhereClausePart.java 2011-04-20 05:08:41 UTC (rev 6239)
+++ trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/datasetviewer/cellcomponent/whereClause/AbstractWhereClausePart.java 2011-04-20 19:54:58 UTC (rev 6240)
@@ -1,7 +1,6 @@
package net.sourceforge.squirrel_sql.fw.datasetviewer.cellcomponent.whereClause;
import net.sourceforge.squirrel_sql.fw.datasetviewer.ColumnDisplayDefinition;
-import net.sourceforge.squirrel_sql.fw.util.StringUtilities;
import org.apache.commons.lang.StringUtils;
@@ -103,7 +102,7 @@
* @param clause
*/
protected void setWhereClause(String clause){
- if(StringUtilities.isBlank(clause)){
+ if(StringUtils.isBlank(clause)){
throw new IllegalArgumentException("clause must not be blank.");
}
this.whereClause = clause;
Modified: trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/datasetviewer/cellcomponent/whereClause/IsNullWhereClausePart.java
===================================================================
--- trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/datasetviewer/cellcomponent/whereClause/IsNullWhereClausePart.java 2011-04-20 05:08:41 UTC (rev 6239)
+++ trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/datasetviewer/cellcomponent/whereClause/IsNullWhereClausePart.java 2011-04-20 19:54:58 UTC (rev 6240)
@@ -1,12 +1,11 @@
package net.sourceforge.squirrel_sql.fw.datasetviewer.cellcomponent.whereClause;
import java.sql.PreparedStatement;
-import java.sql.SQLException;
import net.sourceforge.squirrel_sql.fw.datasetviewer.ColumnDisplayDefinition;
-import net.sourceforge.squirrel_sql.fw.datasetviewer.cellcomponent.IDataTypeComponent;
-import net.sourceforge.squirrel_sql.fw.util.StringUtilities;
+import org.apache.commons.lang.StringUtils;
+
/**
* The part of an where-clause, which presents an <code>column is null</code>
* statement. This implemementation doesn't use parameters, so it is not allowed
@@ -36,7 +35,7 @@
if(columnDef == null){
throw new IllegalArgumentException("columnDef must not be null");
}
- if(StringUtilities.isBlank(columnDef.getColumnName())){
+ if(StringUtils.isBlank(columnDef.getColumnName())){
throw new IllegalArgumentException("columnDef contains not an usable columnName");
}
return (columnDef.getColumnName() + " is null");
Modified: trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/dialects/DB2DialectExt.java
===================================================================
--- trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/dialects/DB2DialectExt.java 2011-04-20 05:08:41 UTC (rev 6239)
+++ trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/dialects/DB2DialectExt.java 2011-04-20 19:54:58 UTC (rev 6240)
@@ -35,9 +35,9 @@
import net.sourceforge.squirrel_sql.fw.sql.ITableInfo;
import net.sourceforge.squirrel_sql.fw.sql.JDBCTypeMapper;
import net.sourceforge.squirrel_sql.fw.sql.TableColumnInfo;
-import net.sourceforge.squirrel_sql.fw.util.StringUtilities;
import org.antlr.stringtemplate.StringTemplate;
+import org.apache.commons.lang.StringUtils;
import org.hibernate.HibernateException;
/**
@@ -1228,12 +1228,12 @@
final String schema = qualifier.getSchema();
final String catalog = qualifier.getCatalog();
final StringBuilder result = new StringBuilder();
- if (!StringUtilities.isEmpty(catalog))
+ if (!StringUtils.isEmpty(catalog))
{
result.append(DialectUtils.shapeIdentifier(catalog, prefs, this));
result.append(".");
}
- if (!StringUtilities.isEmpty(schema))
+ if (!StringUtils.isEmpty(schema))
{
result.append(DialectUtils.shapeIdentifier(schema, prefs, this));
result.append(".");
Modified: trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/dialects/DialectUtils.java
===================================================================
--- trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/dialects/DialectUtils.java 2011-04-20 05:08:41 UTC (rev 6239)
+++ trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/dialects/DialectUtils.java 2011-04-20 19:54:58 UTC (rev 6240)
@@ -28,17 +28,25 @@
import java.util.HashMap;
import java.util.Hashtable;
import java.util.List;
+import java.util.Map.Entry;
import java.util.Vector;
-import java.util.Map.Entry;
-import net.sourceforge.squirrel_sql.fw.sql.*;
+import net.sourceforge.squirrel_sql.fw.sql.DatabaseObjectType;
+import net.sourceforge.squirrel_sql.fw.sql.ForeignKeyColumnInfo;
+import net.sourceforge.squirrel_sql.fw.sql.ForeignKeyInfo;
+import net.sourceforge.squirrel_sql.fw.sql.ISQLDatabaseMetaData;
+import net.sourceforge.squirrel_sql.fw.sql.ITableInfo;
+import net.sourceforge.squirrel_sql.fw.sql.IndexInfo;
+import net.sourceforge.squirrel_sql.fw.sql.JDBCTypeMapper;
+import net.sourceforge.squirrel_sql.fw.sql.PrimaryKeyInfo;
+import net.sourceforge.squirrel_sql.fw.sql.TableColumnInfo;
import net.sourceforge.squirrel_sql.fw.util.StringManager;
import net.sourceforge.squirrel_sql.fw.util.StringManagerFactory;
-import net.sourceforge.squirrel_sql.fw.util.StringUtilities;
import net.sourceforge.squirrel_sql.fw.util.log.ILogger;
import net.sourceforge.squirrel_sql.fw.util.log.LoggerController;
import org.antlr.stringtemplate.StringTemplate;
+import org.apache.commons.lang.StringUtils;
import org.hibernate.HibernateException;
/**
@@ -2455,12 +2463,12 @@
for (final IndexInfo indexInfo : indexInfos)
{
final String indexName = indexInfo.getSimpleName();
- if (StringUtilities.isEmpty(indexName))
+ if (StringUtils.isEmpty(indexName))
{
continue;
}
final String columnName = indexInfo.getColumnName();
- if (StringUtilities.isEmpty(columnName))
+ if (StringUtils.isEmpty(columnName))
{
continue;
}
Modified: trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/dialects/OptionalSqlClause.java
===================================================================
--- trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/dialects/OptionalSqlClause.java 2011-04-20 05:08:41 UTC (rev 6239)
+++ trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/dialects/OptionalSqlClause.java 2011-04-20 19:54:58 UTC (rev 6240)
@@ -19,9 +19,8 @@
package net.sourceforge.squirrel_sql.fw.dialects;
import org.antlr.stringtemplate.StringTemplate;
+import org.apache.commons.lang.StringUtils;
-import net.sourceforge.squirrel_sql.fw.util.StringUtilities;
-
/**
* There are a number of dialects which produce DDL statements which have "optional" clauses such
* that when a value is provided, then a keyword must be used to give context to that value; but when
@@ -69,7 +68,7 @@
result = _st.toString();
}
} else {
- if (!StringUtilities.isEmpty(_variablePart)) {
+ if (!StringUtils.isEmpty(_variablePart)) {
result = new StringBuilder(_staticPart).append(" ").append(_variablePart).toString();
}
}
Modified: trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/gui/debug/DebugEventListener.java
===================================================================
--- trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/gui/debug/DebugEventListener.java 2011-04-20 05:08:41 UTC (rev 6239)
+++ trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/gui/debug/DebugEventListener.java 2011-04-20 19:54:58 UTC (rev 6240)
@@ -30,7 +30,7 @@
import javax.swing.ToolTipManager;
import javax.swing.border.Border;
-import net.sourceforge.squirrel_sql.fw.util.StringUtilities;
+import org.apache.commons.lang.StringUtils;
/**
@@ -114,9 +114,9 @@
toolTipText.append("Button with parentClass=");
toolTipText.append(parentClassName);
} else {
- if (!StringUtilities.isEmpty(sourceName)) {
+ if (!StringUtils.isEmpty(sourceName)) {
toolTipText.append(sourceName);
- } else if (!StringUtilities.isEmpty(sourceClassName)) {
+ } else if (!StringUtils.isEmpty(sourceClassName)) {
toolTipText.append(sourceClassName);
}
}
Modified: trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/sql/DatabaseObjectInfo.java
===================================================================
--- trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/sql/DatabaseObjectInfo.java 2011-04-20 05:08:41 UTC (rev 6239)
+++ trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/sql/DatabaseObjectInfo.java 2011-04-20 19:54:58 UTC (rev 6240)
@@ -21,8 +21,9 @@
import java.sql.SQLException;
import net.sourceforge.squirrel_sql.fw.dialects.DialectFactory;
-import net.sourceforge.squirrel_sql.fw.util.StringUtilities;
+import org.apache.commons.lang.StringUtils;
+
public class DatabaseObjectInfo implements IDatabaseObjectInfo, Serializable
{
/** Property names for this bean. */
@@ -226,7 +227,7 @@
}
- if (StringUtilities.isEmpty(catSep))
+ if (StringUtils.isEmpty(catSep))
{
catSep = ".";
}
@@ -252,7 +253,7 @@
StringBuilder buf = new StringBuilder();
if (supportsCatalogsInDataManipulation
- && !StringUtilities.isEmpty(_catalog))
+ && !StringUtils.isEmpty(_catalog))
{
if (identifierQuoteString != null)
{
Modified: trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/sql/SQLConnection.java
===================================================================
--- trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/sql/SQLConnection.java 2011-04-20 05:08:41 UTC (rev 6239)
+++ trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/sql/SQLConnection.java 2011-04-20 19:54:58 UTC (rev 6240)
@@ -32,10 +32,11 @@
import net.sourceforge.squirrel_sql.fw.util.PropertyChangeReporter;
import net.sourceforge.squirrel_sql.fw.util.StringManager;
import net.sourceforge.squirrel_sql.fw.util.StringManagerFactory;
-import net.sourceforge.squirrel_sql.fw.util.StringUtilities;
import net.sourceforge.squirrel_sql.fw.util.log.ILogger;
import net.sourceforge.squirrel_sql.fw.util.log.LoggerController;
+import org.apache.commons.lang.StringUtils;
+
/**
* This represents a connection to an SQL server. it is basically a wrapper around
* <TT>java.sql.Connection</TT>.
@@ -297,7 +298,7 @@
final Connection conn = getConnection();
final String oldValue = conn.getCatalog();
final DialectType dialectType = DialectFactory.getDialectType(metaData);
- if (!StringUtilities.areStringsEqual(oldValue, catalogName))
+ if (!StringUtils.equals(oldValue, catalogName))
{
setDbSpecificCatalog(dialectType, catalogName);
getPropertyChangeReporter().firePropertyChange(IPropertyNames.CATALOG, oldValue, catalogName);
Modified: trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/util/StringUtilities.java
===================================================================
--- trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/util/StringUtilities.java 2011-04-20 05:08:41 UTC (rev 6239)
+++ trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/util/StringUtilities.java 2011-04-20 19:54:58 UTC (rev 6240)
@@ -19,60 +19,21 @@
*/
import java.util.ArrayList;
...
[truncated message content] |
|
From: <wi...@us...> - 2011-04-25 19:55:49
|
Revision: 6243
http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=6243&view=rev
Author: wis775
Date: 2011-04-25 19:55:42 +0000 (Mon, 25 Apr 2011)
Log Message:
-----------
New plugin "WIKI table configurations":
This plugin provides some pre-defined configurations for various WIKI engines. With this configurations, Squirrel knows, how to transform the selection
of a result table into a WIKI table. At the moment, configurations for the following WIKI's are provided:
- Mediawiki
- TiddlyWiki
This plugin is a enhancement for the functionality "Copy as WIKI table"
Modified Paths:
--------------
trunk/sql12/doc/src/main/resources/changes.txt
Added Paths:
-----------
trunk/sql12/plugins/wikiTableConfigurations/
trunk/sql12/plugins/wikiTableConfigurations/pom.xml
trunk/sql12/plugins/wikiTableConfigurations/src/
trunk/sql12/plugins/wikiTableConfigurations/src/main/
trunk/sql12/plugins/wikiTableConfigurations/src/main/java/
trunk/sql12/plugins/wikiTableConfigurations/src/main/java/net/
trunk/sql12/plugins/wikiTableConfigurations/src/main/java/net/sourceforge/
trunk/sql12/plugins/wikiTableConfigurations/src/main/java/net/sourceforge/squirrel_sql/
trunk/sql12/plugins/wikiTableConfigurations/src/main/java/net/sourceforge/squirrel_sql/plugins/
trunk/sql12/plugins/wikiTableConfigurations/src/main/java/net/sourceforge/squirrel_sql/plugins/wikiTableConfiguration/
trunk/sql12/plugins/wikiTableConfigurations/src/main/java/net/sourceforge/squirrel_sql/plugins/wikiTableConfiguration/WikiTableConfigurationPlugin.java
trunk/sql12/plugins/wikiTableConfigurations/src/main/java/net/sourceforge/squirrel_sql/plugins/wikiTableConfiguration/configurations/
trunk/sql12/plugins/wikiTableConfigurations/src/main/java/net/sourceforge/squirrel_sql/plugins/wikiTableConfiguration/configurations/MediaWikiTableConfiguration.java
trunk/sql12/plugins/wikiTableConfigurations/src/main/java/net/sourceforge/squirrel_sql/plugins/wikiTableConfiguration/configurations/MediaWikiTableConfigurationBeanInfo.java
trunk/sql12/plugins/wikiTableConfigurations/src/main/java/net/sourceforge/squirrel_sql/plugins/wikiTableConfiguration/configurations/TiddlyWikiTableConfiguration.java
trunk/sql12/plugins/wikiTableConfigurations/src/main/java/net/sourceforge/squirrel_sql/plugins/wikiTableConfiguration/configurations/TiddlyWikiTableConfigurationBeanInfo.java
trunk/sql12/plugins/wikiTableConfigurations/src/main/resources/
trunk/sql12/plugins/wikiTableConfigurations/src/main/resources/net/
trunk/sql12/plugins/wikiTableConfigurations/src/main/resources/net/sourceforge/
trunk/sql12/plugins/wikiTableConfigurations/src/main/resources/net/sourceforge/squirrel_sql/
trunk/sql12/plugins/wikiTableConfigurations/src/main/resources/net/sourceforge/squirrel_sql/plugins/
trunk/sql12/plugins/wikiTableConfigurations/src/main/resources/net/sourceforge/squirrel_sql/plugins/wikiTableConfiguration/
trunk/sql12/plugins/wikiTableConfigurations/src/main/resources/net/sourceforge/squirrel_sql/plugins/wikiTableConfiguration/I18NStrings.properties
trunk/sql12/plugins/wikiTableConfigurations/src/test/
trunk/sql12/plugins/wikiTableConfigurations/src/test/java/
trunk/sql12/plugins/wikiTableConfigurations/src/test/java/net/
trunk/sql12/plugins/wikiTableConfigurations/src/test/java/net/sourceforge/
trunk/sql12/plugins/wikiTableConfigurations/src/test/java/net/sourceforge/squirrel_sql/
trunk/sql12/plugins/wikiTableConfigurations/src/test/java/net/sourceforge/squirrel_sql/plugins/
trunk/sql12/plugins/wikiTableConfigurations/src/test/java/net/sourceforge/squirrel_sql/plugins/wikiTableConfiguration/
trunk/sql12/plugins/wikiTableConfigurations/src/test/java/net/sourceforge/squirrel_sql/plugins/wikiTableConfiguration/configurations/
trunk/sql12/plugins/wikiTableConfigurations/src/test/java/net/sourceforge/squirrel_sql/plugins/wikiTableConfiguration/configurations/MediaWikiTableConfigurationBeanInfoTest.java
trunk/sql12/plugins/wikiTableConfigurations/src/test/java/net/sourceforge/squirrel_sql/plugins/wikiTableConfiguration/configurations/MediaWikiTableConfigurationBeanTest.java
trunk/sql12/plugins/wikiTableConfigurations/src/test/java/net/sourceforge/squirrel_sql/plugins/wikiTableConfiguration/configurations/TiddlyWikiTableConfigurationBeanInfoTest.java
trunk/sql12/plugins/wikiTableConfigurations/src/test/java/net/sourceforge/squirrel_sql/plugins/wikiTableConfiguration/configurations/TiddlyWikiTableConfigurationBeanTest.java
trunk/sql12/plugins/wikiTableConfigurations/src/test/resources/
Modified: trunk/sql12/doc/src/main/resources/changes.txt
===================================================================
--- trunk/sql12/doc/src/main/resources/changes.txt 2011-04-25 19:39:21 UTC (rev 6242)
+++ trunk/sql12/doc/src/main/resources/changes.txt 2011-04-25 19:55:42 UTC (rev 6243)
@@ -7,7 +7,14 @@
Enhancements:
-Export as WIKI table:
+New plugin "WIKI table configurations":
+ This plugin provides some pre-defined configurations for various WIKI engines. With this configurations, Squirrel knows, how to transform the selection
+ of a result table into a WIKI table. At the moment, configurations for the following WIKI's are provided:
+ - Mediawiki
+ - TiddlyWiki
+ This plugin is a enhancement for the functionality "Copy as WIKI table"
+
+Copy as WIKI table:
Squirrel is now able, to copy the selection of a result table as WIKI text into the clipboard. (Right click on the result table => Copy as WIKI table)
At the new preferences panel "Global Preferences => Wiki Tables", the user can configure individual templates for the WIKI syntax.
Property changes on: trunk/sql12/plugins/wikiTableConfigurations
___________________________________________________________________
Added: svn:ignore
+ .project
.classpath
.settings
target
Added: trunk/sql12/plugins/wikiTableConfigurations/pom.xml
===================================================================
--- trunk/sql12/plugins/wikiTableConfigurations/pom.xml (rev 0)
+++ trunk/sql12/plugins/wikiTableConfigurations/pom.xml 2011-04-25 19:55:42 UTC (rev 6243)
@@ -0,0 +1,87 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>net.sf.squirrel-sql.plugins</groupId>
+ <artifactId>squirrelsql-plugins-parent-pom</artifactId>
+ <version>3.3.0-SNAPSHOT</version>
+ <relativePath>../squirrelsql-plugins-parent-pom/pom.xml</relativePath>
+ </parent>
+ <groupId>net.sf.squirrel-sql.plugins</groupId>
+ <artifactId>wikiTableConfigurations</artifactId>
+ <version>3.3.0-SNAPSHOT</version>
+ <name>WIKI table plugin</name>
+ <description>Pre defined configurations for tables of different WIKI engines</description>
+ <dependencies>
+ <dependency>
+ <groupId>net.sf.squirrel-sql</groupId>
+ <artifactId>fw</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>net.sf.squirrel-sql</groupId>
+ <artifactId>fw</artifactId>
+ <type>test-jar</type>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>net.sf.squirrel-sql</groupId>
+ <artifactId>squirrel-sql</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>net.sf.squirrel-sql</groupId>
+ <artifactId>squirrel-sql</artifactId>
+ <type>test-jar</type>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.easymock</groupId>
+ <artifactId>easymock</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.easymock</groupId>
+ <artifactId>easymockclassextension</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.mockito</groupId>
+ <artifactId>mockito-all</artifactId>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-source-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-assembly-plugin</artifactId>
+ </plugin>
+ </plugins>
+ </build>
+
+
+ <properties>
+ <pluginClassName>net.sourceforge.squirrel_sql.plugins.wikiTableConfiguration.WikiTableConfigurationPlugin</pluginClassName>
+ </properties>
+</project>
\ No newline at end of file
Property changes on: trunk/sql12/plugins/wikiTableConfigurations/pom.xml
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/sql12/plugins/wikiTableConfigurations/src/main/java/net/sourceforge/squirrel_sql/plugins/wikiTableConfiguration/WikiTableConfigurationPlugin.java
===================================================================
--- trunk/sql12/plugins/wikiTableConfigurations/src/main/java/net/sourceforge/squirrel_sql/plugins/wikiTableConfiguration/WikiTableConfigurationPlugin.java (rev 0)
+++ trunk/sql12/plugins/wikiTableConfigurations/src/main/java/net/sourceforge/squirrel_sql/plugins/wikiTableConfiguration/WikiTableConfigurationPlugin.java 2011-04-25 19:55:42 UTC (rev 6243)
@@ -0,0 +1,225 @@
+/*
+ * Copyright (C) 2011 Stefan Willinger
+ * wi...@us...
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+package net.sourceforge.squirrel_sql.plugins.wikiTableConfiguration;
+
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.util.Iterator;
+import java.util.List;
+
+import net.sourceforge.squirrel_sql.client.IApplication;
+import net.sourceforge.squirrel_sql.client.plugin.DefaultSessionPlugin;
+import net.sourceforge.squirrel_sql.client.plugin.PluginException;
+import net.sourceforge.squirrel_sql.client.plugin.PluginSessionCallback;
+import net.sourceforge.squirrel_sql.client.session.ISession;
+import net.sourceforge.squirrel_sql.fw.gui.action.wikiTable.IWikiTableConfiguration;
+import net.sourceforge.squirrel_sql.fw.gui.action.wikiTable.IWikiTableConfigurationFactory;
+import net.sourceforge.squirrel_sql.fw.gui.action.wikiTable.WikiTableConfigurationFactory;
+import net.sourceforge.squirrel_sql.fw.gui.action.wikiTable.WikiTableConfigurationStorage;
+import net.sourceforge.squirrel_sql.fw.util.FileWrapper;
+import net.sourceforge.squirrel_sql.fw.util.log.ILogger;
+import net.sourceforge.squirrel_sql.fw.util.log.LoggerController;
+import net.sourceforge.squirrel_sql.fw.xml.XMLBeanReader;
+import net.sourceforge.squirrel_sql.fw.xml.XMLBeanWriter;
+import net.sourceforge.squirrel_sql.plugins.wikiTableConfiguration.configurations.MediaWikiTableConfiguration;
+import net.sourceforge.squirrel_sql.plugins.wikiTableConfiguration.configurations.TiddlyWikiTableConfiguration;
+
+
+/**
+ * The scope of this plugin is providing some pre defined (aka build-in) configurations for WIKI tables.
+ * This configurations are use, for exporting the content of a result table to a WIKI text.
+ * For the following WIKI engines are configurations provided:
+ * <li>Mediawiki</li>
+ * <li>TiddlWiki</li>
+ * @author Stefan Willinger
+ *
+ */
+public class WikiTableConfigurationPlugin extends DefaultSessionPlugin {
+
+ /**
+ *
+ */
+ private static final String BUILD_IN_CONFIGURATIONS_XML = "buildInConfigurations.xml";
+
+
+ /** Logger for this class. */
+ private final static ILogger log = LoggerController.createLogger(WikiTableConfigurationPlugin.class);
+
+
+ /** Folder to store user settings in. */
+ private FileWrapper _userSettingsFolder;
+
+
+ private IWikiTableConfigurationFactory wikiTableConfigFactory;
+
+
+ /* (non-Javadoc)
+ * @see net.sourceforge.squirrel_sql.client.plugin.ISessionPlugin#sessionStarted(net.sourceforge.squirrel_sql.client.session.ISession)
+ */
+ public PluginSessionCallback sessionStarted(ISession session) {
+ // nothing to do
+ return null;
+ }
+
+
+
+
+ /* (non-Javadoc)
+ * @see net.sourceforge.squirrel_sql.client.plugin.IPlugin#getInternalName()
+ */
+ public String getInternalName() {
+ return "WIKI tables";
+ }
+
+ /* (non-Javadoc)
+ * @see net.sourceforge.squirrel_sql.client.plugin.IPlugin#getDescriptiveName()
+ */
+ public String getDescriptiveName() {
+ return "Provides configurations for exporting the result table as a WIKI table";
+ }
+
+ /* (non-Javadoc)
+ * @see net.sourceforge.squirrel_sql.client.plugin.IPlugin#getAuthor()
+ */
+ public String getAuthor() {
+ return "Stefan Willinger";
+ }
+
+ /* (non-Javadoc)
+ * @see net.sourceforge.squirrel_sql.client.plugin.IPlugin#getVersion()
+ */
+ public String getVersion() {
+ return "0.1";
+ }
+
+ /**
+ * @see net.sourceforge.squirrel_sql.client.plugin.DefaultPlugin#load(net.sourceforge.squirrel_sql.client.IApplication)
+ */
+ @Override
+ public void load(IApplication app) throws PluginException {
+ super.load(app);
+ wikiTableConfigFactory = app.getWikiTableConfigFactory();
+ }
+
+ /**
+ * Add the provided build-in configurations to the factory
+ * @see MediaWikiTableConfiguration
+ * @see TiddlyWikiTableConfiguration
+ */
+ private void addBuildInConfigs() {
+
+ wikiTableConfigFactory.addBuilInConfiguration(new MediaWikiTableConfiguration());
+ wikiTableConfigFactory.addBuilInConfiguration(new TiddlyWikiTableConfiguration());
+
+ }
+
+
+ /**
+ * Initialize this plugin.
+ */
+ @Override
+ public synchronized void initialize() throws PluginException {
+ super.initialize();
+
+ // Folder to store user settings.
+ try
+ {
+ _userSettingsFolder = getPluginUserSettingsFolder();
+ }
+ catch (IOException ex)
+ {
+ throw new PluginException(ex);
+ }
+
+ addBuildInConfigs();
+
+ // Load plugin preferences.
+ loadPrefs();
+ }
+
+ /**
+ * Load from preferences file.
+ */
+ private void loadPrefs()
+ {
+ try
+ {
+ final XMLBeanReader doc = new XMLBeanReader();
+ final FileWrapper file =
+ fileWrapperFactory.create(_userSettingsFolder, BUILD_IN_CONFIGURATIONS_XML);
+ doc.load(file, getClass().getClassLoader());
+
+ Iterator<?> it = doc.iterator();
+
+ if (it.hasNext()){
+ WikiTableConfigurationStorage data = (WikiTableConfigurationStorage) it.next();
+
+ List<IWikiTableConfiguration> savedBuildIn = data.configurationsAsList();
+ List<IWikiTableConfiguration> currentBuildIn = wikiTableConfigFactory.getBuildInConfigurations();
+
+ /*
+ * For build-in configurations, we need to merge the saved with the current one.
+ * For build-in configurations, we save a state like enabled. And after the last save, a plugin
+ * may have added additional configurations to the build-in ones. So we must merge the both.
+ * If the same config exists in both, the saved on will survival.
+ */
+
+ List<IWikiTableConfiguration> mergedBuildInConfigs = WikiTableConfigurationFactory.merge(savedBuildIn, currentBuildIn);
+ wikiTableConfigFactory.replaceBuilInConfiguration(mergedBuildInConfigs);
+ }
+ }
+ catch (FileNotFoundException ignore)
+ {
+ // property file not found for user - first time user ran pgm.
+ }
+ catch (Exception ex)
+ {
+ final String msg = "Error occured reading from preferences file: " + BUILD_IN_CONFIGURATIONS_XML;
+ log.error(msg, ex);
+ }
+ }
+
+ /**
+ * Save preferences to disk.
+ */
+ private void savePrefs()
+ {
+ try
+ {
+ WikiTableConfigurationStorage storage = new WikiTableConfigurationStorage(wikiTableConfigFactory.getBuildInConfigurations());
+ final XMLBeanWriter wtr = new XMLBeanWriter(storage);
+ wtr.save(fileWrapperFactory.create(_userSettingsFolder, BUILD_IN_CONFIGURATIONS_XML));
+ }
+ catch (Exception ex)
+ {
+ final String msg = "Error occured writing to preferences file: " + BUILD_IN_CONFIGURATIONS_XML;
+ log.error(msg, ex);
+ }
+ }
+
+ /**
+ * Application is shutting down so save preferences.
+ */
+ public void unload()
+ {
+ savePrefs();
+ super.unload();
+ }
+
+}
Property changes on: trunk/sql12/plugins/wikiTableConfigurations/src/main/java/net/sourceforge/squirrel_sql/plugins/wikiTableConfiguration/WikiTableConfigurationPlugin.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/sql12/plugins/wikiTableConfigurations/src/main/java/net/sourceforge/squirrel_sql/plugins/wikiTableConfiguration/configurations/MediaWikiTableConfiguration.java
===================================================================
--- trunk/sql12/plugins/wikiTableConfigurations/src/main/java/net/sourceforge/squirrel_sql/plugins/wikiTableConfiguration/configurations/MediaWikiTableConfiguration.java (rev 0)
+++ trunk/sql12/plugins/wikiTableConfigurations/src/main/java/net/sourceforge/squirrel_sql/plugins/wikiTableConfiguration/configurations/MediaWikiTableConfiguration.java 2011-04-25 19:55:42 UTC (rev 6243)
@@ -0,0 +1,73 @@
+/*
+ * Copyright (C) 2011 Stefan Willinger
+ * wi...@us...
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+package net.sourceforge.squirrel_sql.plugins.wikiTableConfiguration.configurations;
+
+import net.sourceforge.squirrel_sql.fw.gui.action.wikiTable.GenericWikiTableConfigurationBean;
+import net.sourceforge.squirrel_sql.fw.gui.action.wikiTable.IWikiTableConfiguration;
+
+/**
+ * A build in configuration for a MediaWiki table.
+ * @author Stefan Willinger
+ *
+ */
+public class MediaWikiTableConfiguration extends GenericWikiTableConfigurationBean {
+
+ private static final long serialVersionUID = -6873210947889098473L;
+
+ private static final String NAME = "Media Wiki";
+ private static final String TABLE_START = "{| border=\"1\"" + NEW_LINE_PLACEHOLDER ;
+ private static final String HEADER_START = "";
+ private static final String HEADER_CELL = "! "+VALUE_PLACEHOLDER+" " + NEW_LINE_PLACEHOLDER ;
+ private static final String HEADER_END = "";
+ private static final String ROW_START ="|-"+ NEW_LINE_PLACEHOLDER ;
+ private static final String DATA_CELL ="| "+VALUE_PLACEHOLDER +" "+ NEW_LINE_PLACEHOLDER ;
+ private static final String ROW_END ="";
+ private static final String TABLE_END ="|}";
+ private static final String ESCAPE_SEQUENCE = "<nowiki>"+VALUE_PLACEHOLDER+"</nowiki>";
+
+
+ public MediaWikiTableConfiguration() {
+ super(NAME, TABLE_START, HEADER_START, HEADER_CELL, HEADER_END, ROW_START, DATA_CELL, ROW_END, TABLE_END, ESCAPE_SEQUENCE);
+ }
+
+
+ /**
+ * @see net.sourceforge.squirrel_sql.fw.gui.action.wikiTable.GenericWikiTableConfigurationBean#isReadOnly()
+ */
+ @Override
+ public boolean isReadOnly() {
+ return true;
+ }
+
+
+ /**
+ * @see net.sourceforge.squirrel_sql.fw.gui.action.wikiTable.GenericWikiTableConfigurationBean#clone()
+ */
+ @Override
+ public IWikiTableConfiguration clone(){
+ MediaWikiTableConfiguration config = new MediaWikiTableConfiguration();
+ config.setEnabled(isEnabled());
+ return config;
+ }
+
+
+
+
+
+}
Property changes on: trunk/sql12/plugins/wikiTableConfigurations/src/main/java/net/sourceforge/squirrel_sql/plugins/wikiTableConfiguration/configurations/MediaWikiTableConfiguration.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/sql12/plugins/wikiTableConfigurations/src/main/java/net/sourceforge/squirrel_sql/plugins/wikiTableConfiguration/configurations/MediaWikiTableConfigurationBeanInfo.java
===================================================================
--- trunk/sql12/plugins/wikiTableConfigurations/src/main/java/net/sourceforge/squirrel_sql/plugins/wikiTableConfiguration/configurations/MediaWikiTableConfigurationBeanInfo.java (rev 0)
+++ trunk/sql12/plugins/wikiTableConfigurations/src/main/java/net/sourceforge/squirrel_sql/plugins/wikiTableConfiguration/configurations/MediaWikiTableConfigurationBeanInfo.java 2011-04-25 19:55:42 UTC (rev 6243)
@@ -0,0 +1,59 @@
+/*
+ * Copyright (C) 2011 Stefan Willinger
+ * wi...@us...
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+package net.sourceforge.squirrel_sql.plugins.wikiTableConfiguration.configurations;
+
+import java.beans.IntrospectionException;
+import java.beans.PropertyDescriptor;
+import java.beans.SimpleBeanInfo;
+
+import net.sourceforge.squirrel_sql.client.plugin.PluginInfo;
+
+/**
+ * A BeanInfo, that only provides the enabled property.
+ * @author Stefan Willinger
+ *
+ */
+public class MediaWikiTableConfigurationBeanInfo extends SimpleBeanInfo{
+ private interface IPropNames extends PluginInfo.IPropertyNames
+ {
+ // Empty body, purely to shorten the interface name for convienience.
+ }
+
+ /**
+ * See http://tinyurl.com/63no6t for discussion of the proper thread-safe way to implement
+ * getPropertyDescriptors().
+ *
+ * @see java.beans.SimpleBeanInfo#getPropertyDescriptors()
+ */
+ @Override
+ public PropertyDescriptor[] getPropertyDescriptors()
+ {
+ try
+ {
+ PropertyDescriptor[] s_descr = new PropertyDescriptor[1];
+
+ s_descr[0] = new PropertyDescriptor("enabled", MediaWikiTableConfiguration.class, "isEnabled", "setEnabled");
+ return s_descr;
+ }
+ catch (IntrospectionException e)
+ {
+ throw new Error(e);
+ }
+ }
+}
Property changes on: trunk/sql12/plugins/wikiTableConfigurations/src/main/java/net/sourceforge/squirrel_sql/plugins/wikiTableConfiguration/configurations/MediaWikiTableConfigurationBeanInfo.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/sql12/plugins/wikiTableConfigurations/src/main/java/net/sourceforge/squirrel_sql/plugins/wikiTableConfiguration/configurations/TiddlyWikiTableConfiguration.java
===================================================================
--- trunk/sql12/plugins/wikiTableConfigurations/src/main/java/net/sourceforge/squirrel_sql/plugins/wikiTableConfiguration/configurations/TiddlyWikiTableConfiguration.java (rev 0)
+++ trunk/sql12/plugins/wikiTableConfigurations/src/main/java/net/sourceforge/squirrel_sql/plugins/wikiTableConfiguration/configurations/TiddlyWikiTableConfiguration.java 2011-04-25 19:55:42 UTC (rev 6243)
@@ -0,0 +1,67 @@
+/*
+ * Copyright (C) 2011 Stefan Willinger
+ * wi...@us...
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+package net.sourceforge.squirrel_sql.plugins.wikiTableConfiguration.configurations;
+
+import net.sourceforge.squirrel_sql.fw.gui.action.wikiTable.GenericWikiTableConfigurationBean;
+import net.sourceforge.squirrel_sql.fw.gui.action.wikiTable.IWikiTableConfiguration;
+
+/**
+ * A build in configuration for a TiddlyWiki table.
+ * @author Stefan Willinger
+ *
+ */
+public class TiddlyWikiTableConfiguration extends GenericWikiTableConfigurationBean {
+
+ private static final long serialVersionUID = 754221028689690621L;
+
+ private static final String NAME = "Tiddly Wiki";
+ private static final String TABLE_START = "" ;
+ private static final String HEADER_START = "";
+ private static final String HEADER_CELL = "|!"+VALUE_PLACEHOLDER;
+ private static final String HEADER_END = "|"+NEW_LINE_PLACEHOLDER;
+ private static final String ROW_START ="" ;
+ private static final String DATA_CELL ="|"+VALUE_PLACEHOLDER;
+ private static final String ROW_END ="|"+NEW_LINE_PLACEHOLDER;
+ private static final String TABLE_END ="";
+ private static final String ESCAPE_SEQUENCE = "<nowiki>"+VALUE_PLACEHOLDER+"</nowiki>";
+
+
+ public TiddlyWikiTableConfiguration() {
+ super(NAME, TABLE_START, HEADER_START, HEADER_CELL, HEADER_END, ROW_START, DATA_CELL, ROW_END, TABLE_END, ESCAPE_SEQUENCE);
+ }
+
+ /**
+ * @see net.sourceforge.squirrel_sql.fw.gui.action.wikiTable.GenericWikiTableConfigurationBean#isReadOnly()
+ */
+ @Override
+ public boolean isReadOnly() {
+ return true;
+ }
+
+ /**
+ * @see net.sourceforge.squirrel_sql.fw.gui.action.wikiTable.GenericWikiTableConfigurationBean#clone()
+ */
+ @Override
+ public IWikiTableConfiguration clone(){
+ TiddlyWikiTableConfiguration conifg = new TiddlyWikiTableConfiguration();
+ conifg.setEnabled(isEnabled());
+ return conifg;
+ }
+
+}
Property changes on: trunk/sql12/plugins/wikiTableConfigurations/src/main/java/net/sourceforge/squirrel_sql/plugins/wikiTableConfiguration/configurations/TiddlyWikiTableConfiguration.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/sql12/plugins/wikiTableConfigurations/src/main/java/net/sourceforge/squirrel_sql/plugins/wikiTableConfiguration/configurations/TiddlyWikiTableConfigurationBeanInfo.java
===================================================================
--- trunk/sql12/plugins/wikiTableConfigurations/src/main/java/net/sourceforge/squirrel_sql/plugins/wikiTableConfiguration/configurations/TiddlyWikiTableConfigurationBeanInfo.java (rev 0)
+++ trunk/sql12/plugins/wikiTableConfigurations/src/main/java/net/sourceforge/squirrel_sql/plugins/wikiTableConfiguration/configurations/TiddlyWikiTableConfigurationBeanInfo.java 2011-04-25 19:55:42 UTC (rev 6243)
@@ -0,0 +1,59 @@
+/*
+ * Copyright (C) 2011 Stefan Willinger
+ * wi...@us...
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+package net.sourceforge.squirrel_sql.plugins.wikiTableConfiguration.configurations;
+
+import java.beans.IntrospectionException;
+import java.beans.PropertyDescriptor;
+import java.beans.SimpleBeanInfo;
+
+import net.sourceforge.squirrel_sql.client.plugin.PluginInfo;
+
+/**
+ * A BeanInfo, that only provides the enabled property.
+ * @author Stefan Willinger
+ *
+ */
+public class TiddlyWikiTableConfigurationBeanInfo extends SimpleBeanInfo{
+ private interface IPropNames extends PluginInfo.IPropertyNames
+ {
+ // Empty body, purely to shorten the interface name for convienience.
+ }
+
+ /**
+ * See http://tinyurl.com/63no6t for discussion of the proper thread-safe way to implement
+ * getPropertyDescriptors().
+ *
+ * @see java.beans.SimpleBeanInfo#getPropertyDescriptors()
+ */
+ @Override
+ public PropertyDescriptor[] getPropertyDescriptors()
+ {
+ try
+ {
+ PropertyDescriptor[] s_descr = new PropertyDescriptor[1];
+
+ s_descr[0] = new PropertyDescriptor("enabled", TiddlyWikiTableConfiguration.class, "isEnabled", "setEnabled");
+ return s_...
[truncated message content] |
|
From: <wi...@us...> - 2011-04-25 19:39:31
|
Revision: 6242
http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=6242&view=rev
Author: wis775
Date: 2011-04-25 19:39:21 +0000 (Mon, 25 Apr 2011)
Log Message:
-----------
New function: Copy as WIKI table.
Provides a way, to copy the selection of a result table as WIKI text into the clipboard. This is a generic implementation, which does not provide any WIKI specific configuration. At the global preferences tab "WIKI table", the user can configure a specific configuration as a template. The user-specific configuration is saved in a own file.
Modified Paths:
--------------
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/Application.java
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/IApplication.java
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/preferences/GeneralPreferencesPanel.java
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/preferences/GlobalPreferencesSheet.java
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/preferences/PreferenceType.java
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/util/ApplicationFiles.java
trunk/sql12/app/src/main/resources/net/sourceforge/squirrel_sql/client/I18NStrings.properties
trunk/sql12/app/src/main/resources/net/sourceforge/squirrel_sql/client/preferences/I18NStrings.properties
trunk/sql12/doc/src/main/resources/changes.txt
trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/gui/TablePopupMenu.java
trunk/sql12/fw/src/main/resources/net/sourceforge/squirrel_sql/fw/gui/I18NStrings.properties
trunk/sql12/fw/src/main/resources/net/sourceforge/squirrel_sql/fw/gui/action/I18NStrings.properties
Added Paths:
-----------
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/preferences/WikiTablePreferencesPanel.java
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/preferences/WikiTablePreferencesTab.java
trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/gui/action/TableCopyWikiCommand.java
trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/gui/action/wikiTable/
trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/gui/action/wikiTable/CopyWikiTableAction.java
trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/gui/action/wikiTable/CopyWikiTableActionFactory.java
trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/gui/action/wikiTable/GenericWikiTableConfigurationBean.java
trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/gui/action/wikiTable/GenericWikiTableTransformer.java
trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/gui/action/wikiTable/ICopyWikiTableActionFactory.java
trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/gui/action/wikiTable/ITableActionCallback.java
trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/gui/action/wikiTable/IWikiTableConfiguration.java
trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/gui/action/wikiTable/IWikiTableConfigurationFactory.java
trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/gui/action/wikiTable/IWikiTableTransformer.java
trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/gui/action/wikiTable/WikiTableConfigurationFactory.java
trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/gui/action/wikiTable/WikiTableConfigurationStorage.java
trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/gui/action/wikiTable/WikiTableSelection.java
trunk/sql12/fw/src/main/resources/net/sourceforge/squirrel_sql/fw/gui/action/wikiTable/
trunk/sql12/fw/src/main/resources/net/sourceforge/squirrel_sql/fw/gui/action/wikiTable/I18NStrings.properties
trunk/sql12/fw/src/test/java/net/sourceforge/squirrel_sql/fw/gui/action/wikiTable/
trunk/sql12/fw/src/test/java/net/sourceforge/squirrel_sql/fw/gui/action/wikiTable/AbstractWikiTableExporterTest.java
trunk/sql12/fw/src/test/java/net/sourceforge/squirrel_sql/fw/gui/action/wikiTable/CopyWikiTableActionFactoryTest.java
trunk/sql12/fw/src/test/java/net/sourceforge/squirrel_sql/fw/gui/action/wikiTable/GenericWikiTableConfigurationBeanTest.java
trunk/sql12/fw/src/test/java/net/sourceforge/squirrel_sql/fw/gui/action/wikiTable/WikiTableConfigurationFactoryTest.java
Modified: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/Application.java
===================================================================
--- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/Application.java 2011-04-23 20:44:03 UTC (rev 6241)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/Application.java 2011-04-25 19:39:21 UTC (rev 6242)
@@ -75,6 +75,10 @@
import net.sourceforge.squirrel_sql.fw.datasetviewer.CellImportExportInfoSaver;
import net.sourceforge.squirrel_sql.fw.datasetviewer.cellcomponent.DTProperties;
import net.sourceforge.squirrel_sql.fw.gui.ErrorDialog;
+import net.sourceforge.squirrel_sql.fw.gui.action.wikiTable.IWikiTableConfiguration;
+import net.sourceforge.squirrel_sql.fw.gui.action.wikiTable.IWikiTableConfigurationFactory;
+import net.sourceforge.squirrel_sql.fw.gui.action.wikiTable.WikiTableConfigurationFactory;
+import net.sourceforge.squirrel_sql.fw.gui.action.wikiTable.WikiTableConfigurationStorage;
import net.sourceforge.squirrel_sql.fw.sql.SQLDriverManager;
import net.sourceforge.squirrel_sql.fw.util.BareBonesBrowserLaunch;
import net.sourceforge.squirrel_sql.fw.util.BaseException;
@@ -149,6 +153,11 @@
/** Application level SQL History. */
private SQLHistory _sqlHistory;
+
+ /**
+ * Configuration factory for WIKI tables.
+ */
+ private IWikiTableConfigurationFactory wikiTableConfigFactory = WikiTableConfigurationFactory.getInstance();
/** Current type of JDBC debug logging that we are doing. */
private int _jdbcDebugType = SquirrelPreferences.IJdbcDebugTypes.NONE;
@@ -272,6 +281,9 @@
// Save options selected for DataType-specific properties
saveDataTypePreferences();
+
+ // Save user specific WIKI configurations
+ saveUserSpecificWikiConfigurations();
_prefs.save();
}
@@ -778,6 +790,10 @@
// i18n[Application.splash.loaddatatypeprops=Loading Data Type Properties...]
indicateNewStartupTask(splash, s_stringMgr.getString("Application.splash.loaddatatypeprops"));
loadDTProperties();
+
+ // i18n[Application.splash.loadsqlhistory=Loading user specific WIKI configurations...]
+ indicateNewStartupTask(splash, s_stringMgr.getString("Application.splash.loadUserSpecificWikiConfiguration"));
+ loadUserSpecificWikiTableConfigurations();
// i18n[Application.splash.showmainwindow=Showing main window...]
indicateNewStartupTask(splash, s_stringMgr.getString("Application.splash.showmainwindow"));
@@ -886,6 +902,43 @@
}
}
}
+
+ /**
+ * Load the configurations for WIKI tables.
+ * @see WikiTableConfigurationStorage
+ */
+ @SuppressWarnings("unchecked")
+ private void loadUserSpecificWikiTableConfigurations()
+ {
+ try
+ {
+ WikiTableConfigurationStorage data;
+
+ XMLBeanReader doc = new XMLBeanReader();
+ doc.load(new ApplicationFiles().getUserSpecificWikiConfigurationsFile());
+ Iterator it = doc.iterator();
+ if (it.hasNext()){
+ data = (WikiTableConfigurationStorage) it.next();
+ wikiTableConfigFactory.replaceUserSpecificConfigurations(data.configurationsAsList());
+ }
+ }
+ catch (FileNotFoundException ignore)
+ {
+ // History file not found for user - first time user ran pgm.
+ }
+ catch (Exception ex)
+ {
+ // i18n[Application.error.loadsqlhistory=Unable to load SQL history from persistant storage.]
+ s_log.error(s_stringMgr.getString("Application.error.loadUserSpecificWikiConfiguration"), ex);
+ }
+ finally
+ {
+ if (_sqlHistory == null)
+ {
+ _sqlHistory = new SQLHistory();
+ }
+ }
+ }
/**
* Save application level SQL history for current user.
@@ -917,6 +970,25 @@
s_log.error(s_stringMgr.getString("Application.error.savesqlhistory"), ex);
}
}
+
+ /**
+ * Save user specific configurations for WIKI tables
+ */
+ private void saveUserSpecificWikiConfigurations()
+ {
+ // Get the history into an array.
+ try
+ {
+ WikiTableConfigurationStorage data = new WikiTableConfigurationStorage(wikiTableConfigFactory.getUserSpecificConfigurations());
+
+ XMLBeanWriter wtr = new XMLBeanWriter(data);
+ wtr.save(new ApplicationFiles().getUserSpecificWikiConfigurationsFile());
+ }
+ catch (Exception ex)
+ {
+ s_log.error(s_stringMgr.getString("Application.error.saveUserSpecificWikiConfiguration"), ex);
+ }
+ }
/**
* Load the options previously selected by user for import/export of data in various Cells.
@@ -1106,6 +1178,9 @@
case EDITWHERECOL_PREFERENCES:
saveEditWhereColsInfo();
break;
+ case WIKI_CONFIGURATION:
+ saveUserSpecificWikiConfigurations();
+ break;
default:
s_log.error("Unknown preference type: " + preferenceType);
}
@@ -1243,5 +1318,17 @@
public void setShutdownTimer(IShutdownTimer shutdownTimer)
{
_shutdownTimer = shutdownTimer;
+ }
+
+ /**
+ * @see net.sourceforge.squirrel_sql.client.IApplication#getWikiTableConfigFactory()
+ */
+ @Override
+ public IWikiTableConfigurationFactory getWikiTableConfigFactory() {
+ return wikiTableConfigFactory;
+ }
+
+ public void setWikiTableConfigFactory(IWikiTableConfigurationFactory wikiTableConfigFactory) {
+ this.wikiTableConfigFactory = wikiTableConfigFactory;
}
}
Modified: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/IApplication.java
===================================================================
--- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/IApplication.java 2011-04-23 20:44:03 UTC (rev 6241)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/IApplication.java 2011-04-25 19:39:21 UTC (rev 6242)
@@ -23,13 +23,9 @@
import javax.swing.JComponent;
import javax.swing.JMenu;
-import net.sourceforge.squirrel_sql.client.gui.db.DataCache;
-import net.sourceforge.squirrel_sql.fw.sql.SQLDriverManager;
-import net.sourceforge.squirrel_sql.fw.util.IMessageHandler;
-import net.sourceforge.squirrel_sql.fw.util.TaskThreadPool;
-
import net.sourceforge.squirrel_sql.client.action.ActionCollection;
import net.sourceforge.squirrel_sql.client.gui.WindowManager;
+import net.sourceforge.squirrel_sql.client.gui.db.DataCache;
import net.sourceforge.squirrel_sql.client.gui.desktopcontainer.DesktopStyle;
import net.sourceforge.squirrel_sql.client.gui.mainframe.MainFrame;
import net.sourceforge.squirrel_sql.client.plugin.IPlugin;
@@ -40,6 +36,10 @@
import net.sourceforge.squirrel_sql.client.session.ISQLEntryPanelFactory;
import net.sourceforge.squirrel_sql.client.session.SessionManager;
import net.sourceforge.squirrel_sql.client.session.mainpanel.SQLHistory;
+import net.sourceforge.squirrel_sql.fw.gui.action.wikiTable.IWikiTableConfigurationFactory;
+import net.sourceforge.squirrel_sql.fw.sql.SQLDriverManager;
+import net.sourceforge.squirrel_sql.fw.util.IMessageHandler;
+import net.sourceforge.squirrel_sql.fw.util.TaskThreadPool;
/**
* Defines the API to do callbacks on the application.
*/
@@ -237,4 +237,13 @@
void removeApplicationListener(ApplicationListener l);
+
+ /**
+ * Returns a factory for WIKI table configurations.
+ * This factory is managing the system and user-specific configurations for WIKI tables.
+ * @return A factory for WIKI table configurations.
+ * @see IWikiTableConfigurationFactory
+ */
+ IWikiTableConfigurationFactory getWikiTableConfigFactory();
+
}
Modified: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/preferences/GeneralPreferencesPanel.java
===================================================================
--- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/preferences/GeneralPreferencesPanel.java 2011-04-23 20:44:03 UTC (rev 6241)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/preferences/GeneralPreferencesPanel.java 2011-04-25 19:39:21 UTC (rev 6242)
@@ -21,23 +21,31 @@
import java.awt.GridBagConstraints;
import java.awt.GridBagLayout;
import java.awt.Insets;
+import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
-import java.awt.event.ActionEvent;
import java.util.ArrayList;
-import javax.swing.*;
+import javax.swing.BorderFactory;
+import javax.swing.BoxLayout;
+import javax.swing.ButtonGroup;
+import javax.swing.JCheckBox;
+import javax.swing.JComboBox;
+import javax.swing.JLabel;
+import javax.swing.JPanel;
+import javax.swing.JRadioButton;
+import javax.swing.JScrollPane;
+import javax.swing.JTextField;
import javax.swing.border.EmptyBorder;
-import org.apache.commons.lang.StringUtils;
-
import net.sourceforge.squirrel_sql.client.ApplicationArguments;
import net.sourceforge.squirrel_sql.client.IApplication;
import net.sourceforge.squirrel_sql.client.util.ApplicationFiles;
import net.sourceforge.squirrel_sql.fw.util.LocaleUtils;
import net.sourceforge.squirrel_sql.fw.util.StringManager;
import net.sourceforge.squirrel_sql.fw.util.StringManagerFactory;
-import net.sourceforge.squirrel_sql.fw.util.StringUtilities;
+import org.apache.commons.lang.StringUtils;
+
class GeneralPreferencesPanel implements IGlobalPreferencesPanel
{
/** Internationalized strings for this class. */
Modified: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/preferences/GlobalPreferencesSheet.java
===================================================================
--- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/preferences/GlobalPreferencesSheet.java 2011-04-23 20:44:03 UTC (rev 6241)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/preferences/GlobalPreferencesSheet.java 2011-04-25 19:39:21 UTC (rev 6242)
@@ -308,6 +308,7 @@
_panels.add(new ProxyPreferencesPanel());
_panels.add(new DataTypePreferencesPanel());
_panels.add(new UpdatePreferencesTab());
+ _panels.add(new WikiTablePreferencesTab());
// Go thru all loaded plugins asking for panels.
PluginInfo[] plugins = _app.getPluginManager().getPluginInformation();
Modified: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/preferences/PreferenceType.java
===================================================================
--- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/preferences/PreferenceType.java 2011-04-23 20:44:03 UTC (rev 6241)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/preferences/PreferenceType.java 2011-04-25 19:39:21 UTC (rev 6242)
@@ -31,5 +31,6 @@
DATATYPE_PREFERENCES,
CELLIMPORTEXPORT_PREFERENCES,
SQLHISTORY,
- EDITWHERECOL_PREFERENCES
+ EDITWHERECOL_PREFERENCES,
+ WIKI_CONFIGURATION
}
Added: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/preferences/WikiTablePreferencesPanel.java
===================================================================
--- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/preferences/WikiTablePreferencesPanel.java (rev 0)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/preferences/WikiTablePreferencesPanel.java 2011-04-25 19:39:21 UTC (rev 6242)
@@ -0,0 +1,816 @@
+/*
+ * Copyright (C) 2011 Stefan Willinger
+ * wi...@us...
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+package net.sourceforge.squirrel_sql.client.preferences;
+
+import java.awt.BorderLayout;
+import java.awt.Component;
+import java.awt.Dimension;
+import java.awt.FlowLayout;
+import java.awt.GridBagConstraints;
+import java.awt.GridBagLayout;
+import java.awt.Insets;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.awt.event.FocusEvent;
+import java.awt.event.FocusListener;
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.swing.BorderFactory;
+import javax.swing.DefaultListModel;
+import javax.swing.JButton;
+import javax.swing.JCheckBox;
+import javax.swing.JLabel;
+import javax.swing.JList;
+import javax.swing.JPanel;
+import javax.swing.JScrollPane;
+import javax.swing.JTable;
+import javax.swing.JTextArea;
+import javax.swing.JTextField;
+import javax.swing.ListSelectionModel;
+import javax.swing.SwingConstants;
+import javax.swing.SwingUtilities;
+import javax.swing.event.ListSelectionEvent;
+import javax.swing.event.ListSelectionListener;
+
+import net.sourceforge.squirrel_sql.client.IApplication;
+import net.sourceforge.squirrel_sql.fw.gui.action.wikiTable.GenericWikiTableConfigurationBean;
+import net.sourceforge.squirrel_sql.fw.gui.action.wikiTable.IWikiTableConfiguration;
+import net.sourceforge.squirrel_sql.fw.gui.action.wikiTable.IWikiTableConfigurationFactory;
+import net.sourceforge.squirrel_sql.fw.gui.action.wikiTable.WikiTableConfigurationFactory;
+import net.sourceforge.squirrel_sql.fw.util.StringManager;
+import net.sourceforge.squirrel_sql.fw.util.StringManagerFactory;
+
+import org.apache.commons.lang.StringUtils;
+
+/**
+ * Preferences panel for WIKI table configurations
+ * @author Stefan Willinger
+ *
+ */
+public class WikiTablePreferencesPanel extends JPanel {
+
+ /** Internationalized strings for this class. */
+ private static final StringManager s_stringMgr =
+ StringManagerFactory.getStringManager(WikiTablePreferencesPanel.class);
+
+ private final Insets LABEL_INSETS = new Insets(2, 28, 6, 0);
+
+ private final Insets FIELD_INSETS = new Insets(2, 8, 6, 28);
+
+
+ private IWikiTableConfigurationFactory wikiTableConfigFactory = WikiTableConfigurationFactory.getInstance();
+
+
+ private IApplication application;
+
+
+ // Components of the detail panel
+
+ private JLabel nameLable = null;
+
+ private JTextField name = null;
+
+ private JLabel tableStartTagLabel = null;
+
+ private JTextField tableStartTag = null;
+
+ private JLabel headerStartTagLabel = null;
+
+ private JTextField headerStartTag = null;
+
+ private JLabel headerCellTagLabel = null;
+
+ private JTextField headerCellTag = null;
+
+ private JLabel headerEndTagLabel = null;
+
+ private JTextField headerEndTag = null;
+
+ private JLabel rowStartTagLabel = null;
+
+ private JTextField rowStartTag = null;
+
+ private JLabel cellTagLabel = null;
+
+ private JTextField cellTag = null;
+
+ private JLabel rowEndTagLabel = null;
+
+ private JTextField rowEndTag = null;
+
+ private JLabel tableEndTagLabel = null;
+
+ private JTextField tableEndTag = null;
+
+ private JLabel noWikiTagLabel = null;
+
+ private JTextField noWikiTag = null;
+
+ private DefaultListModel wikiConfigListModel = null;
+
+ private JList wikiConfigList;
+
+ private JButton newButton;
+
+ private JButton copyButton;
+
+ private JButton deleteButton;
+
+ private JTable exampleTable;
+
+ private JTextArea exampleText;
+
+ private IWikiTableConfiguration currentConfigurationInView;
+
+ private JCheckBox enabled;
+
+
+
+ public WikiTablePreferencesPanel()
+ {
+ super(new GridBagLayout());
+ createUserInterface();
+ }
+
+
+ /**
+ * Creates the user Interface
+ */
+ private void createUserInterface()
+ {
+ JPanel jp = new JPanel(new GridBagLayout());
+
+ GridBagConstraints gbc = new GridBagConstraints();
+ gbc.fill = GridBagConstraints.BOTH;
+ gbc.insets = new Insets(4, 4, 4, 4);
+ gbc.gridx = 0;
+ gbc.gridy = 0;
+ gbc.weightx = 0;
+ gbc.weighty = 1;
+ jp.add(createOverviewPanel(), gbc);
+
+ gbc.gridy = 1;
+ gbc.weighty = 0;
+ gbc.fill = GridBagConstraints.HORIZONTAL;
+ jp.add(createNotePanel(), gbc);
+
+ gbc.weightx = 1;
+ gbc.weighty = 1;
+ gbc.gridheight=2;
+ gbc.gridy = 0;
+ gbc.gridx =1;
+ gbc.fill = GridBagConstraints.BOTH;
+
+ jp.add(createDetailPanel(), gbc);
+
+
+ gbc.weightx = 1;
+ gbc.weighty = 1;
+ gbc.gridheight=2;
+ gbc.gridy = 0;
+ gbc.gridx =2;
+ gbc.fill = GridBagConstraints.BOTH;
+
+ jp.add(createExamplePanel(), gbc);
+
+ JScrollPane sp = new JScrollPane(jp);
+ gbc = new GridBagConstraints();
+ gbc.fill=GridBagConstraints.BOTH;
+ gbc.weightx=1;
+ gbc.weighty=1;
+ add(sp,gbc);
+
+ }
+
+ /**
+ * Create the component, which shows a example.
+ * The example contains a {@link JTable} and a {@link JTextField}. If the user change a element of the configuration, then the example will be updated.
+ * So we can provide a feedback of the result immediately.
+ */
+ private Component createExamplePanel() {
+ JPanel jp = new JPanel(new GridBagLayout());
+ jp.setBorder(BorderFactory.createTitledBorder(s_stringMgr.getString("WikiTablePreferencesPanel.titleExample"))); //$NON-NLS-1$
+
+ GridBagConstraints gbc = new GridBagConstraints();
+
+
+ String[][] rowData = new String[][]{
+ {s_stringMgr.getString("WikiTablePreferencesPanel.austria"), s_stringMgr.getString("WikiTablePreferencesPanel.vienna")}, //$NON-NLS-1$ //$NON-NLS-2$
+ {s_stringMgr.getString("WikiTablePreferencesPanel.italy"), s_stringMgr.getString("WikiTablePreferencesPanel.rome")} //$NON-NLS-1$ //$NON-NLS-2$
+ };
+
+ String[] columnNames = new String[]{s_stringMgr.getString("WikiTablePreferencesPanel.country"), s_stringMgr.getString("WikiTablePreferencesPanel.captial")}; //$NON-NLS-1$ //$NON-NLS-2$
+
+ exampleTable = new JTable(rowData, columnNames);
+ exampleTable.setMinimumSize(new Dimension(10,10));
+
+ JScrollPane sp = new JScrollPane(exampleTable);
+ sp.setPreferredSize(new Dimension(100,50));
+
+ gbc.fill=GridBagConstraints.BOTH;
+ gbc.weighty=1;
+ gbc.weighty=0.1;
+ jp.add(sp, gbc);
+
+
+ gbc.gridx=0;
+ gbc.gridy=1;
+ gbc.fill=GridBagConstraints.HORIZONTAL;
+ gbc.weighty=0;
+ gbc.weightx=0;
+ jp.add(new JLabel(s_stringMgr.getString("WikiTablePreferencesPanel.titleResultExample")), gbc); //$NON-NLS-1$
+
+
+ exampleText = new JTextArea(15,20);
+ exampleText.setWrapStyleWord(true);
+ exampleText.setEditable(false);
+ exampleText.setLineWrap(false);
+
+
+ gbc.gridy=2;
+ gbc.fill=GridBagConstraints.BOTH;
+ gbc.weighty=1;
+ gbc.weightx=1;
+
+ sp = new JScrollPane(exampleText);
+ jp.add(sp, gbc);
+
+ return jp;
+ }
+
+
+ /**
+ * Create the panel with a small help text for the user.
+ * This panel indicates, which variables are allowed.
+ */
+ private Component createNotePanel() {
+ JPanel jp = new JPanel();
+ jp.setBorder(BorderFactory.createTitledBorder("Note")); //$NON-NLS-1$
+
+
+ String text = "<html><body>"+ //$NON-NLS-1$
+ s_stringMgr.getString("WikiTablePreferencesPanel.hintValueVariable") + //$NON-NLS-1$
+ "<br />" + //$NON-NLS-1$
+ s_stringMgr.getString("WikiTablePreferencesPanel.hintNewLine") + //$NON-NLS-1$
+ "</body></html>"; //$NON-NLS-1$
+ JLabel label = new JLabel(text);
+
+ jp.add(label);
+
+ return jp;
+ }
+
+
+ /**
+ * The overview panel contains a list of all available configurations.
+ * There are some methods provided for creating, copying or deleting configurations.
+ * @return
+ */
+ private Component createOverviewPanel() {
+ JPanel jp = new JPanel(new BorderLayout());
+ jp.setBorder(BorderFactory.createTitledBorder(s_stringMgr.getString("WikiTablePreferencesPanel.titleOverview"))); //$NON-NLS-1$
+
+ wikiConfigListModel = new DefaultListModel();
+
+ wikiConfigList = new JList(wikiConfigListModel);
+ wikiConfigList.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
+ wikiConfigList.addListSelectionListener(new ListSelectionListener() {
+ @Override
+ public void valueChanged(ListSelectionEvent e) {
+ SwingUtilities.invokeLater(new Runnable() {
+
+ @Override
+ public void run() {
+ IWikiTableConfiguration selectedValue = (IWikiTableConfiguration) wikiConfigList.getSelectedValue();
+ showDataFor(selectedValue);
+ if(selectedValue != null){
+ copyButton.setEnabled(true);
+ }else{
+ copyButton.setEnabled(false);
+ }
+ }
+ });
+
+ }
+ });
+
+ JScrollPane sp = new JScrollPane(wikiConfigList);
+
+ JPanel buttonPanel = new JPanel(new FlowLayout());
+ newButton = new JButton(s_stringMgr.getString("WikiTablePreferencesPanel.new")); //$NON-NLS-1$
+ newButton.addActionListener(new ActionListener() {
+ @Override
+ public void actionPerformed(ActionEvent e) {
+ IWikiTableConfiguration newConfig = new GenericWikiTableConfigurationBean();
+ addNewConfigToList(newConfig);
+ }
+
+ private void addNewConfigToList(IWikiTableConfiguration newConfig) {
+ wikiConfigListModel.addElement(newConfig);
+ wikiConfigList.setSelectedValue(newConfig, true);
+ }
+ });
+ buttonPanel.add(newButton);
+
+ copyButton = new JButton(s_stringMgr.getString("WikiTablePreferencesPanel.copy")); //$NON-NLS-1$
+ copyButton.addActionListener(new ActionListener() {
+ @Override
+ public void actionPerformed(ActionEvent e) {
+ IWikiTableConfiguration newConfig = ((IWikiTableConfiguration)wikiConfigList.getSelectedValue()).copyAsUserSpecific();
+
+ int suffix = 0;
+
+ String originalName = newConfig.getName();
+
+ do{
+ suffix++;
+ newConfig.setName(originalName+"_"+suffix); //$NON-NLS-1$
+ }while(!isUniqueName(newConfig));
+
+
+ addNewConfigToList(newConfig);
+ }
+
+
+ });
+
+ buttonPanel.add(copyButton);
+
+ deleteButton = new JButton(s_stringMgr.getString("WikiTablePreferencesPanel.delete")); //$NON-NLS-1$
+ deleteButton.addActionListener(new ActionListener() {
+ @Override
+ public void actionPerformed(ActionEvent e) {
+ int selectedIndex = wikiConfigList.getSelectedIndex();
+ wikiConfigList.setSelectedIndex(0);
+ wikiConfigListModel.remove(selectedIndex);
+ // we always have at least on item - the build in configuration
+// wikiConfigList.invalidate();
+ }
+ });
+ buttonPanel.add(deleteButton);
+
+ jp.add(sp, BorderLayout.CENTER);
+ jp.add(buttonPanel, BorderLayout.SOUTH);
+
+ return jp;
+ }
+
+
+ /**
+ * The detail panel contains all information of a specific configuration.
+ * The user can edit the configuration in this panel.
+ */
+ private JPanel createDetailPanel(){
+ JPanel jp = new JPanel(new GridBagLayout());
+ jp.setBorder(BorderFactory.createTitledBorder(s_stringMgr.getString("WikiTablePreferencesPanel.titleDetailPanel"))); //$NON-NLS-1$
+ jp.setMinimumSize(new Dimension(400,50));
+
+ final GridBagConstraints gbc = new GridBagConstraints();
+
+ int row= 0;
+
+ setLabelConstraints(gbc, row);
+ nameLable = new JLabel(s_stringMgr.getString("WikiTablePreferencesPanel.name"), SwingConstants.RIGHT); //$NON-NLS-1$
+ jp.add(nameLable, gbc);
+
+ setFieldConstraints(gbc, row);
+ name = new JTextField(30);
+ jp.add(name, gbc);
+
+ setLabelConstraints(gbc, ++row);
+ tableStartTagLabel = new JLabel(s_stringMgr.getString("WikiTablePreferencesPanel.tableStartTag"), SwingConstants.RIGHT); //$NON-NLS-1$
+ jp.add(tableStartTagLabel, gbc);
+
+ setFieldConstraints(gbc, row);
+ tableStartTag = new JTextField(30);
+ jp.add(tableStartTag, gbc);
+
+
+ setLabelConstraints(gbc, ++row);
+ headerStartTagLabel = new JLabel(s_stringMgr.getString("WikiTablePreferencesPanel.headerStartTag"), SwingConstants.RIGHT); //$NON-NLS-1$
+ jp.add(headerStartTagLabel, gbc);
+
+ setFieldConstraints(gbc, row);
+ headerStartTag = new JTextField(30);
+ jp.add(headerStartTag, gbc);
+
+ setLabelConstraints(gbc, ++row);
+ headerCellTagLabel = new JLabel(s_stringMgr.getString("WikiTablePreferencesPanel.headerCellTag"), SwingConstants.RIGHT); //$NON-NLS-1$
+ jp.add(headerCellTagLabel, gbc);
+
+ setFieldConstraints(gbc, row);
+ headerCellTag = new JTextField(30);
+ jp.add(headerCellTag, gbc);
+
+ setLabelConstraints(gbc, ++row);
+ headerEndTagLabel = new JLabel(s_stringMgr.getString("WikiTablePreferencesPanel.headerEndTag"), SwingConstants.RIGHT); //$NON-NLS-1$
+ jp.add(headerEndTagLabel, gbc);
+
+ setFieldConstraints(gbc, row);
+ headerEndTag = new JTextField(30);
+ jp.add(headerEndTag, gbc);
+
+ setLabelConstraints(gbc, ++row);
+ rowStartTagLabel = new JLabel(s_stringMgr.getString("WikiTablePreferencesPanel.rowStartTag"), SwingConstants.RIGHT); //$NON-NLS-1$
+ jp.add(rowStartTagLabel, gbc);
+
+ setFieldConstraints(gbc, row);
+ rowStartTag = new JTextField(30);
+ jp.add(rowStartTag, gbc);
+
+ setLabelConstraints(gbc, ++row);
+ cellTagLabel = new JLabel(s_stringMgr.getString("WikiTablePreferencesPanel.cellTag"), SwingConstants.RIGHT); //$NON-NLS-1$
+ jp.add(cellTagLabel, gbc);
+
+ setFieldConstraints(gbc, row);
+ cellTag = new JTextField(30);
+ jp.add(cellTag, gbc);
+
+ setLabelConstraints(gbc, ++row);
+ rowEndTagLabel = new JLabel(s_stringMgr.getString("WikiTablePreferencesPanel.rowEndTag"), SwingConstants.RIGHT); //$NON-NLS-1$
+ jp.add(rowEndTagLabel, gbc);
+
+ setFieldConstraints(gbc, row);
+ rowEndTag = new JTextField(30);
+ jp.add(rowEndTag, gbc);
+
+ setLabelConstraints(gbc, ++row);
+ tableEndTagLabel = new JLabel(s_stringMgr.getString("WikiTablePreferencesPanel.tableEndTag"), SwingConstants.RIGHT); //$NON-NLS-1$
+ jp.add(tableEndTagLabel, gbc);
+
+ setFieldConstraints(gbc, row);
+ tableEndTag = new JTextField(30);
+ jp.add(tableEndTag, gbc);
+
+ setLabelConstraints(gbc, ++row);
+ noWikiTagLabel = new JLabel(s_stringMgr.getString("WikiTablePreferencesPanel.noWikiTag"), SwingConstants.RIGHT); //$NON-NLS-1$
+ jp.add(noWikiTagLabel, gbc);
+
+ setFieldConstraints(gbc, row);
+ noWikiTag = new JTextField(30);
+ jp.add(noWikiTag, gbc);
+
+ setLabelConstraints(gbc, ++row);
+ noWikiTagLabel = new JLabel(s_stringMgr.getString("WikiTablePreferencesPanel.e...
[truncated message content] |
|
From: <wi...@us...> - 2011-04-28 19:43:23
|
Revision: 6247
http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=6247&view=rev
Author: wis775
Date: 2011-04-28 19:43:17 +0000 (Thu, 28 Apr 2011)
Log Message:
-----------
3293737: A exception occurs if the value of a SMALLINT column is edited in a result table.
It is necessary, that the data of a content tab is read by the CellComponentFactory.
Modified Paths:
--------------
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/SQLExecutionHandler.java
trunk/sql12/doc/src/main/resources/changes.txt
Modified: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/SQLExecutionHandler.java
===================================================================
--- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/SQLExecutionHandler.java 2011-04-26 20:14:11 UTC (rev 6246)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/SQLExecutionHandler.java 2011-04-28 19:43:17 UTC (rev 6247)
@@ -218,7 +218,7 @@
* message panel, otherwise the UI will get behind and slow the execution
* of the script and prevent the user from cancelling the operation. So
* this method will track the total time when executing a large script,
- * otherwise for small scripts it puts out a message for every statement.
+ * otherwise for small scripts it puts out a message for every statemselect * from employeeent.
*/
public void sqlExecutionComplete(SQLExecutionInfo exInfo,
int processedStatementCount,
@@ -409,7 +409,8 @@
}
DialectType dialectType =
DialectFactory.getDialectType(_session.getMetaData());
- info.setNumberResultRowsRead(rsds.setResultSet(rs, dialectType));
+
+ info.setNumberResultRowsRead(rsds.setContentsTabResultSet(rs, null, dialectType));
_executionHandlerListener.addResultsTab(info, rsds, rsmdds, model, _resultTabToReplace);
rsds = null;
Modified: trunk/sql12/doc/src/main/resources/changes.txt
===================================================================
--- trunk/sql12/doc/src/main/resources/changes.txt 2011-04-26 20:14:11 UTC (rev 6246)
+++ trunk/sql12/doc/src/main/resources/changes.txt 2011-04-28 19:43:17 UTC (rev 6247)
@@ -52,6 +52,8 @@
Bug-fixes:
+3293737: A exception occurs if the value of a SMALLINT column is edited in a result table.
+
When editing table cells in a text area, the input field for the file name will be shown in an appropriate size
instead of being very small. If the user change the size of the dialog, the input field for the file name will use the extra space.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ger...@us...> - 2011-05-09 21:34:41
|
Revision: 6251
http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=6251&view=rev
Author: gerdwagner
Date: 2011-05-09 21:34:32 +0000 (Mon, 09 May 2011)
Log Message:
-----------
More Query Builder
Modified Paths:
--------------
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/db/JTreeAliasesListImpl.java
trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/GraphController.java
trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/GraphPanelController.java
trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/GraphPlugin.java
trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/GraphPluginResources.java
trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/ModeManager.java
trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/QueryColumnPanel.java
trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/QueryData.java
trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/querybuilder/sqlgen/FromClauseGenerator.java
trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/querybuilder/sqlgen/FromClauseRes.java
trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/querybuilder/sqlgen/QueryBuilderSQLGenerator.java
trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/querybuilder/sqlgen/SelectClauseGenerator.java
trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/querybuilder/sqlgen/SelectClauseRes.java
trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/xmlbeans/GraphControllerXmlBean.java
trunk/sql12/plugins/graph/src/main/resources/net/sourceforge/squirrel_sql/plugins/graph/GraphPluginResources.properties
trunk/sql12/plugins/graph/src/main/resources/net/sourceforge/squirrel_sql/plugins/graph/I18NStrings.properties
Added Paths:
-----------
trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/gui/TreeDnDHandler.java
trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/gui/TreeDnDHandlerCallback.java
trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/querybuilder/
trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/querybuilder/GraphDockHandle.java
trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/querybuilder/GraphDockHandleAdmin.java
trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/querybuilder/GraphDockHandleAdminListerner.java
trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/querybuilder/GraphQueryOrderPanelCtrl.java
trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/querybuilder/GraphQueryResultPanel.java
trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/querybuilder/GraphQueryResultPanelCtrl.java
trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/querybuilder/GraphQuerySQLPanel.java
trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/querybuilder/GraphQuerySQLPanelCtrl.java
trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/querybuilder/GraphQueryWherePanel.java
trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/querybuilder/GraphQueryWherePanelCtrl.java
trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/querybuilder/QueryBuilderController.java
trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/querybuilder/QueryFilterController.java
trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/querybuilder/QueryFilterDlg.java
trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/querybuilder/QueryFilterListener.java
trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/querybuilder/QueryFilterOperators.java
trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/querybuilder/SyncListener.java
trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/querybuilder/WhereClauseOperator.java
trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/querybuilder/WhereConditionColumnWrapper.java
trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/querybuilder/WhereTreeNodeStructure.java
trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/querybuilder/WhereTreeSync.java
trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/querybuilder/sqlgen/
trunk/sql12/plugins/graph/src/main/resources/net/sourceforge/squirrel_sql/plugins/graph/images/deletefolder.gif
trunk/sql12/plugins/graph/src/main/resources/net/sourceforge/squirrel_sql/plugins/graph/images/newandfolder.gif
trunk/sql12/plugins/graph/src/main/resources/net/sourceforge/squirrel_sql/plugins/graph/images/neworfolder.gif
trunk/sql12/plugins/graph/src/main/resources/net/sourceforge/squirrel_sql/plugins/graph/querybuilder/
trunk/sql12/plugins/graph/src/main/resources/net/sourceforge/squirrel_sql/plugins/graph/querybuilder/I18NStrings.properties
Removed Paths:
-------------
trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/GraphDockHandle.java
trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/GraphQueryResultPanel.java
trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/GraphQueryResultPanelCtrl.java
trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/GraphQuerySQLPanel.java
trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/GraphQuerySQLPanelCtrl.java
trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/QueryBuilder.java
trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/QueryBuilderController.java
trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/QueryFilterController.java
trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/QueryFilterDlg.java
trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/QueryFilterListener.java
trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/QueryFilterOperators.java
trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/SyncListener.java
trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/querybuilder/sqlgen/WhereClauseGenerator.java
trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/sqlgen/
Modified: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/db/JTreeAliasesListImpl.java
===================================================================
--- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/db/JTreeAliasesListImpl.java 2011-05-09 00:15:30 UTC (rev 6250)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/db/JTreeAliasesListImpl.java 2011-05-09 21:34:32 UTC (rev 6251)
@@ -1,5 +1,7 @@
package net.sourceforge.squirrel_sql.client.gui.db;
+import net.sourceforge.squirrel_sql.fw.gui.TreeDnDHandler;
+import net.sourceforge.squirrel_sql.fw.gui.TreeDnDHandlerCallback;
import net.sourceforge.squirrel_sql.fw.sql.ISQLAlias;
import net.sourceforge.squirrel_sql.fw.util.StringManager;
import net.sourceforge.squirrel_sql.fw.util.StringManagerFactory;
@@ -35,8 +37,9 @@
/** Logger for this class. */
private final static ILogger s_log = LoggerController.createLogger(JTreeAliasesListImpl.class);
+ private TreeDnDHandler _treeDnDHandler;
- private static enum PasteMode
+ private static enum PasteMode
{
COPY, CUT;
}
@@ -44,10 +47,6 @@
JTree _tree = new JTree()
{
- /**
- * serialVersionUID
- */
- private static final long serialVersionUID = 2730266929882888194L;
public String getToolTipText(MouseEvent event)
{
@@ -116,11 +115,6 @@
{
DefaultTreeCellRenderer treeCellRenderer = new DefaultTreeCellRenderer()
{
- /**
- * serialVersionUID
- */
- private static final long serialVersionUID = -5605712993858096622L;
-
public Component getTreeCellRendererComponent(JTree tree, Object value, boolean sel, boolean expanded, boolean leaf, int row, boolean hasFocus)
{
return modifyRenderer(super.getTreeCellRendererComponent(tree, value, sel, expanded, leaf, row, hasFocus), value);
@@ -132,11 +126,6 @@
AbstractAction cancelCutAction = new AbstractAction()
{
- /**
- * serialVersionUID
- */
- private static final long serialVersionUID = -663600537047876086L;
-
public void actionPerformed(ActionEvent actionEvent)
{
if (null != _pathsToPaste && PasteMode.CUT.equals(_pasteMode))
@@ -182,44 +171,30 @@
private void initDnD()
{
- try
+ TreeDnDHandlerCallback treeDnDHandlerCallback = new TreeDnDHandlerCallback()
{
- _tree.setDragEnabled(true);
- DropTarget dt = new DropTarget();
+ @Override
+ public boolean nodeAcceptsKids(DefaultMutableTreeNode selNode)
+ {
+ return onNodeAcceptsKids(selNode);
+ }
- dt.addDropTargetListener(new DropTargetAdapter()
+ @Override
+ public void dndExecuted()
{
- public void drop(DropTargetDropEvent dtde)
- {
- onDrop(dtde);
- }
- });
+ //To change body of implemented methods use File | Settings | File Templates.
+ }
+ };
- _tree.setDropTarget(dt);
- }
- catch (TooManyListenersException e)
- {
- throw new RuntimeException(e);
- }
+ _treeDnDHandler = new TreeDnDHandler(_tree, treeDnDHandlerCallback);
}
- private void onDrop(DropTargetDropEvent dtde)
+ private boolean onNodeAcceptsKids(DefaultMutableTreeNode selNode)
{
- if(false == dtde.isLocalTransfer())
- {
- return;
- }
-
- TreePath targetPath = _tree.getPathForLocation(dtde.getLocation().x, dtde.getLocation().y);
-
- TreePath[] toPaste = _tree.getSelectionPaths();
-
- if(0 != (DnDConstants.ACTION_COPY_OR_MOVE & dtde.getDropAction()))
- {
- execCut(toPaste, targetPath);
- }
+ return false == selNode.isLeaf();
}
+
private void initTree()
{
DefaultTreeModel treeModel = (DefaultTreeModel) _tree.getModel();
@@ -778,7 +753,7 @@
execCopyToPaste(_pathsToPaste, _tree.getSelectionPath());
break;
case CUT:
- execCut(_pathsToPaste, _tree.getSelectionPath());
+ _treeDnDHandler.execCut(_pathsToPaste, _tree.getSelectionPath());
break;
}
}
@@ -881,67 +856,6 @@
}
}
- private void execCut(TreePath[] pathsToPaste, TreePath targetPath)
- {
- DefaultTreeModel dtm = (DefaultTreeModel) _tree.getModel();
-
- ArrayList<DefaultMutableTreeNode> cutNodes = new ArrayList<DefaultMutableTreeNode>();
-
- for (int i = 0; i < pathsToPaste.length; i++)
- {
- if(false == pathsToPaste[i].equals(targetPath))
- {
- DefaultMutableTreeNode cutNode = (DefaultMutableTreeNode) pathsToPaste[i].getLastPathComponent();
- cutNodes.add(cutNode);
- dtm.removeNodeFromParent(cutNode);
- }
- }
-
- if (null == targetPath)
- {
- DefaultMutableTreeNode root = (DefaultMutableTreeNode) dtm.getRoot();
-
- int[] childIndices = new int[cutNodes.size()];
- for (int i = 0; i < cutNodes.size(); i++)
- {
- childIndices[i] = root.getChildCount();
- root.add(cutNodes.get(i));
- }
- //dtm.nodeStructureChanged(root);
- dtm.nodesWereInserted(root, childIndices);
- }
- else
- {
- DefaultMutableTreeNode selNode = (DefaultMutableTreeNode) targetPath.getLastPathComponent();
-
- if (selNode.isLeaf())
- {
- DefaultMutableTreeNode parent = (DefaultMutableTreeNode) selNode.getParent();
- for (int i = 0; i < cutNodes.size(); i++)
- {
- parent.insert(cutNodes.get(i), parent.getIndex(selNode) + 1);
- }
- dtm.nodeStructureChanged(parent);
-
- }
- else
- {
- for (int i = 0; i < cutNodes.size(); i++)
- {
- selNode.add(cutNodes.get(i));
- }
- dtm.nodeStructureChanged(selNode);
- }
- }
-
- TreePath[] newSelPaths = new TreePath[cutNodes.size()];
- for (int i = 0; i < newSelPaths.length; i++)
- {
- newSelPaths[i] = new TreePath(cutNodes.get(i).getPath());
- }
- _tree.setSelectionPaths(newSelPaths);
- }
-
public void copyToPasteSelected()
{
_pathsToPaste = _tree.getSelectionPaths();
Added: trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/gui/TreeDnDHandler.java
===================================================================
--- trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/gui/TreeDnDHandler.java (rev 0)
+++ trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/gui/TreeDnDHandler.java 2011-05-09 21:34:32 UTC (rev 6251)
@@ -0,0 +1,136 @@
+package net.sourceforge.squirrel_sql.fw.gui;
+
+import javax.swing.*;
+import javax.swing.tree.DefaultMutableTreeNode;
+import javax.swing.tree.DefaultTreeModel;
+import javax.swing.tree.TreePath;
+import java.awt.dnd.DnDConstants;
+import java.awt.dnd.DropTarget;
+import java.awt.dnd.DropTargetAdapter;
+import java.awt.dnd.DropTargetDropEvent;
+import java.util.ArrayList;
+import java.util.TooManyListenersException;
+
+/**
+ * If a tree is bssed upon DefaultTreeModel and DefaultMutableTreeNodes this class
+ * can handle default (Windows Explorer like) drag and drop.
+ *
+ * All one needs to do is to pass this class the tree itself and a callback that decides
+ * whether droped nodes should be childeren or siblings of the node they where droped at.
+ *
+ */
+public class TreeDnDHandler
+{
+ private JTree _tree;
+ private TreeDnDHandlerCallback _treeDnDHandlerCallback;
+
+ public TreeDnDHandler(JTree tree, TreeDnDHandlerCallback treeDnDHandlerCallback)
+ {
+ _tree = tree;
+ _treeDnDHandlerCallback = treeDnDHandlerCallback;
+
+ initDnD();
+ }
+
+ private void initDnD()
+ {
+ try
+ {
+ _tree.setDragEnabled(true);
+ DropTarget dt = new DropTarget();
+
+ dt.addDropTargetListener(new DropTargetAdapter()
+ {
+ public void drop(DropTargetDropEvent dtde)
+ {
+ onDrop(dtde);
+ }
+ });
+
+ _tree.setDropTarget(dt);
+ }
+ catch (TooManyListenersException e)
+ {
+ throw new RuntimeException(e);
+ }
+ }
+
+ private void onDrop(DropTargetDropEvent dtde)
+ {
+ if(false == dtde.isLocalTransfer())
+ {
+ return;
+ }
+
+ TreePath targetPath = _tree.getPathForLocation(dtde.getLocation().x, dtde.getLocation().y);
+
+ TreePath[] toPaste = _tree.getSelectionPaths();
+
+ if(0 != (DnDConstants.ACTION_COPY_OR_MOVE & dtde.getDropAction()))
+ {
+ execCut(toPaste, targetPath);
+ _treeDnDHandlerCallback.dndExecuted();
+ }
+ }
+
+
+ public void execCut(TreePath[] pathsToPaste, TreePath targetPath)
+ {
+ DefaultTreeModel dtm = (DefaultTreeModel) _tree.getModel();
+
+ ArrayList<DefaultMutableTreeNode> cutNodes = new ArrayList<DefaultMutableTreeNode>();
+
+ for (int i = 0; i < pathsToPaste.length; i++)
+ {
+ if(false == pathsToPaste[i].equals(targetPath))
+ {
+ DefaultMutableTreeNode cutNode = (DefaultMutableTreeNode) pathsToPaste[i].getLastPathComponent();
+ cutNodes.add(cutNode);
+ dtm.removeNodeFromParent(cutNode);
+ }
+ }
+
+ if (null == targetPath)
+ {
+ DefaultMutableTreeNode root = (DefaultMutableTreeNode) dtm.getRoot();
+
+ int[] childIndices = new int[cutNodes.size()];
+ for (int i = 0; i < cutNodes.size(); i++)
+ {
+ childIndices[i] = root.getChildCount();
+ root.add(cutNodes.get(i));
+ }
+ dtm.nodesWereInserted(root, childIndices);
+ }
+ else
+ {
+ DefaultMutableTreeNode selNode = (DefaultMutableTreeNode) targetPath.getLastPathComponent();
+
+ if (false == _treeDnDHandlerCallback.nodeAcceptsKids(selNode))
+ {
+ DefaultMutableTreeNode parent = (DefaultMutableTreeNode) selNode.getParent();
+ for (int i = 0; i < cutNodes.size(); i++)
+ {
+ parent.insert(cutNodes.get(i), parent.getIndex(selNode) + 1);
+ }
+ dtm.nodeStructureChanged(parent);
+
+ }
+ else
+ {
+ for (int i = 0; i < cutNodes.size(); i++)
+ {
+ selNode.add(cutNodes.get(i));
+ }
+ dtm.nodeStructureChanged(selNode);
+ }
+ }
+
+ TreePath[] newSelPaths = new TreePath[cutNodes.size()];
+ for (int i = 0; i < newSelPaths.length; i++)
+ {
+ newSelPaths[i] = new TreePath(cutNodes.get(i).getPath());
+ }
+ _tree.setSelectionPaths(newSelPaths);
+ }
+}
Added: trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/gui/TreeDnDHandlerCallback.java
===================================================================
--- trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/gui/TreeDnDHandlerCallback.java (rev 0)
+++ trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/gui/TreeDnDHandlerCallback.java 2011-05-09 21:34:32 UTC (rev 6251)
@@ -0,0 +1,11 @@
+package net.sourceforge.squirrel_sql.fw.gui;
+
+
+import javax.swing.tree.DefaultMutableTreeNode;
+
+public interface TreeDnDHandlerCallback
+{
+ public boolean nodeAcceptsKids(DefaultMutableTreeNode selNode);
+
+ void dndExecuted();
+}
Modified: trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/GraphController.java
===================================================================
--- trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/GraphController.java 2011-05-09 00:15:30 UTC (rev 6250)
+++ trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/GraphController.java 2011-05-09 21:34:32 UTC (rev 6251)
@@ -129,7 +129,7 @@
ZoomerXmlBean zoomerXmlBean = graphControllerXmlBean.getZoomerXmlBean();
PrintXmlBean printXmlBean = graphControllerXmlBean.getPrintXmlBean();
boolean queryHideNoJoins = graphControllerXmlBean.isQueryHideNoJoins();
- _panelController.initMode(modeIndex, zoomerXmlBean, printXmlBean, queryHideNoJoins);
+ _panelController.initMode(modeIndex, zoomerXmlBean, printXmlBean, queryHideNoJoins, graphControllerXmlBean.getWhereTreeNodeStructure());
_panelController.getDesktopController().setShowConstraintNames(graphControllerXmlBean.isShowConstraintNames());
_panelController.getDesktopController().setShowQualifiedTableNames(graphControllerXmlBean.isShowQualifiedTableNames());
@@ -137,7 +137,7 @@
else
{
_tabToWindowHandler.setTitle(_plugin.patchName(_tabToWindowHandler.getTitle(), _session));
- _panelController.initMode(Mode.DEFAULT, null, null, false);
+ _panelController.initMode(Mode.DEFAULT, null, null, false, null);
}
_tabToWindowHandler.showGraph();
@@ -225,6 +225,7 @@
xmlBean.setPrintXmlBean(_panelController.getDesktopController().getZoomPrintController().getPrintXmlBean());
xmlBean.setModeIndex(_panelController.getModeManager().getMode().getIndex());
xmlBean.setQueryHideNoJoins(_panelController.getModeManager().isQueryHideNoJoins());
+ xmlBean.setWhereTreeNodeStructure(_panelController.getModeManager().getWhereTreeNodeStructure());
Vector<TableFrameController> tblCtrls = _tableFramesModel.getTblCtrls();
Deleted: trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/GraphDockHandle.java
===================================================================
--- trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/GraphDockHandle.java 2011-05-09 00:15:30 UTC (rev 6250)
+++ trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/GraphDockHandle.java 2011-05-09 21:34:32 UTC (rev 6251)
@@ -1,41 +0,0 @@
-package net.sourceforge.squirrel_sql.plugins.graph;
-
-import javax.swing.*;
-
-public class GraphDockHandle
-{
- private GraphControllerFacade _graphControllerFacade;
- private JPanel _panel;
- private int _lastHeight;
- private boolean _showing;
-
- public GraphDockHandle(GraphControllerFacade graphControllerFacade, JPanel panel, int height)
- {
- _graphControllerFacade = graphControllerFacade;
- _panel = panel;
- _lastHeight = height;
- }
-
- public void show()
- {
- _showing = true;
- _graphControllerFacade.showDock(_panel, _lastHeight);
- }
-
- public int getLastHeigth()
- {
- return _lastHeight;
- }
-
- public void hide()
- {
- _showing = false;
- _lastHeight = _panel.getHeight();
- _graphControllerFacade.hideDock();
- }
-
- public boolean isShowing()
- {
- return _showing;
- }
-}
Modified: trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/GraphPanelController.java
===================================================================
--- trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/GraphPanelController.java 2011-05-09 00:15:30 UTC (rev 6250)
+++ trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/GraphPanelController.java 2011-05-09 21:34:32 UTC (rev 6251)
@@ -1,6 +1,7 @@
package net.sourceforge.squirrel_sql.plugins.graph;
import net.sourceforge.squirrel_sql.client.session.ISession;
+import net.sourceforge.squirrel_sql.plugins.graph.querybuilder.WhereTreeNodeStructure;
import net.sourceforge.squirrel_sql.plugins.graph.xmlbeans.PrintXmlBean;
import net.sourceforge.squirrel_sql.plugins.graph.xmlbeans.ZoomerXmlBean;
@@ -97,9 +98,9 @@
return _graphPanel;
}
- public void initMode(Mode mode, ZoomerXmlBean zoomerXmlBean, PrintXmlBean printXmlBean, boolean queryHideNoJoins)
+ public void initMode(Mode mode, ZoomerXmlBean zoomerXmlBean, PrintXmlBean printXmlBean, boolean queryHideNoJoins, WhereTreeNodeStructure whereTreeNodeStructure)
{
- _modeManager.initMode(mode, zoomerXmlBean, printXmlBean, queryHideNoJoins, _graphDesktopController.createEdgesListener(), _graphDesktopController.getDesktopPane());
+ _modeManager.initMode(mode, zoomerXmlBean, printXmlBean, queryHideNoJoins, whereTreeNodeStructure, _graphDesktopController.createEdgesListener(), _graphDesktopController.getDesktopPane());
onModeChanged();
_modeManager.addModeManagerListener(new ModeManagerListener()
Modified: trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/GraphPlugin.java
===================================================================
--- trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/GraphPlugin.java 2011-05-09 00:15:30 UTC (rev 6250)
+++ trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/GraphPlugin.java 2011-05-09 21:34:32 UTC (rev 6251)
@@ -42,8 +42,6 @@
private Hashtable<IIdentifier, GraphController[]> _grapControllersBySessionID = new Hashtable<IIdentifier, GraphController[]>();
- private HashMap<IIdentifier,QueryBuilder> _queryBuilderBySessionID = new HashMap<IIdentifier, QueryBuilder>();
-
/**
* Logger for this class.
*/
@@ -197,8 +195,6 @@
public void sessionEnding(ISession session)
{
- _queryBuilderBySessionID.remove(session.getIdentifier());
-
GraphController[] controllers = _grapControllersBySessionID.remove(session.getIdentifier());
for (int i = 0; i < controllers.length; i++)
Modified: trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/GraphPluginResources.java
===================================================================
--- trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/GraphPluginResources.java 2011-05-09 00:15:30 UTC (rev 6250)
+++ trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/GraphPluginResources.java 2011-05-09 21:34:32 UTC (rev 6251)
@@ -5,7 +5,7 @@
public final class GraphPluginResources extends PluginResources
{
- GraphPluginResources(IPlugin plugin)
+ public GraphPluginResources(IPlugin plugin)
{
super(GraphPluginResources.class.getName(), plugin);
}
@@ -36,5 +36,8 @@
String HIDE_DOCK = "Hidedock";
String HIDE_DOCK_SEL = "HidedockSel";
+ String NEW_AND_FOLDER = "newandfolder";
+ String NEW_OR_FOLDER = "neworfolder";
+ String DELETE_FOLDER = "deletefolder";
}
}
Deleted: trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/GraphQueryResultPanel.java
===================================================================
--- trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/GraphQueryResultPanel.java 2011-05-09 00:15:30 UTC (rev 6250)
+++ trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/GraphQueryResultPanel.java 2011-05-09 21:34:32 UTC (rev 6251)
@@ -1,53 +0,0 @@
-package net.sourceforge.squirrel_sql.plugins.graph;
-
-import net.sourceforge.squirrel_sql.client.session.ISession;
-import net.sourceforge.squirrel_sql.client.session.mainpanel.SQLResultExecuterPanel;
-import net.sourceforge.squirrel_sql.fw.util.StringManager;
-import net.sourceforge.squirrel_sql.fw.util.StringManagerFactory;
-
-import javax.swing.*;
-import java.awt.*;
-
-public class GraphQueryResultPanel extends JPanel
-{
- private static final StringManager s_stringMgr = StringManagerFactory.getStringManager(GraphQueryResultPanel.class);
-
- SQLResultExecuterPanel resultExecuterPanel;
- JCheckBox chkAutoSyncSQL;
- JButton btnSyncSQLNow;
-
-
- public GraphQueryResultPanel(ISession session, HideDockButtonHandler hideDockButtonHandler)
- {
- setLayout(new BorderLayout());
-
- resultExecuterPanel = new SQLResultExecuterPanel(session);
- add(createButtonPanel(hideDockButtonHandler), BorderLayout.NORTH);
- add(resultExecuterPanel, BorderLayout.CENTER);
- }
-
- private JPanel createButtonPanel(HideDockButtonHandler hideDockButtonHandler)
- {
- JPanel ret = new JPanel(new GridBagLayout());
-
- GridBagConstraints gbc;
-
- gbc = new GridBagConstraints(0,0,1,1,0,0,GridBagConstraints.WEST, GridBagConstraints.NONE, new Insets(5,5,5,10),0,0);
- ret.add(hideDockButtonHandler.getHideButton(), gbc);
-
- gbc = new GridBagConstraints(1,0,1,1,0,0,GridBagConstraints.WEST, GridBagConstraints.NONE, new Insets(5,0,5,5),0,0);
- chkAutoSyncSQL = new JCheckBox(s_stringMgr.getString("graph.GraphQueryResultPanel.autoSyncResult"));
- ret.add(chkAutoSyncSQL, gbc);
-
- gbc = new GridBagConstraints(2,0,1,1,0,0,GridBagConstraints.WEST, GridBagConstraints.NONE, new Insets(5,0,5,5),0,0);
- btnSyncSQLNow = new JButton(s_stringMgr.getString("graph.GraphQueryResultPanel.syncResultNow"));
- ret.add(btnSyncSQLNow, gbc);
-
- gbc = new GridBagConstraints(3,0,1,1,1,1,GridBagConstraints.WEST, GridBagConstraints.NONE, new Insets(5,0,5,5),0,0);
- ret.add(new JPanel(), gbc);
-
- return ret;
- }
-
-
-}
Deleted: trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/GraphQueryResultPanelCtrl.java
===================================================================
--- trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/GraphQueryResultPanelCtrl.java 2011-05-09 00:15:30 UTC (rev 6250)
+++ trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/GraphQueryResultPanelCtrl.java 2011-05-09 21:34:32 UTC (rev 6251)
@@ -1,103 +0,0 @@
-package net.sourceforge.squirrel_sql.plugins.graph;
-
-import net.sourceforge.squirrel_sql.client.session.ISession;
-import net.sourceforge.squirrel_sql.client.session.event.SQLExecutionAdapter;
-
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-
-public class GraphQueryResultPanelCtrl
-{
- private GraphQueryResultPanel _graphQueryResultPanel;
- private String _lastSQL;
- private boolean _isExecuting;
- private String _nextSQL;
-
- public GraphQueryResultPanelCtrl(ISession session, HideDockButtonHandler hideDockButtonHandler, final SyncListener syncListener)
- {
- _graphQueryResultPanel = new GraphQueryResultPanel(session, hideDockButtonHandler);
-
- _graphQueryResultPanel.btnSyncSQLNow.addActionListener(new ActionListener()
- {
- @Override
- public void actionPerformed(ActionEvent e)
- {
- syncListener.synRequested();
- }
- });
-
- _graphQueryResultPanel.chkAutoSyncSQL.addActionListener(new ActionListener()
- {
- @Override
- public void actionPerformed(ActionEvent e)
- {
- onAutoSyncChanged(syncListener);
- }
- });
-
- _graphQueryResultPanel.resultExecuterPanel.addSQLExecutionListener(new SQLExecutionAdapte...
[truncated message content] |
|
From: <wi...@us...> - 2011-05-16 18:22:42
|
Revision: 6262
http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=6262&view=rev
Author: wis775
Date: 2011-05-16 18:22:36 +0000 (Mon, 16 May 2011)
Log Message:
-----------
3137852: DB2 Plugin - The source code is not visible, if a char column contains a default value.
Modified Paths:
--------------
trunk/sql12/doc/src/main/resources/changes.txt
trunk/sql12/plugins/db2/src/main/java/net/sourceforge/squirrel_sql/plugins/db2/tab/TableSourceTab.java
Modified: trunk/sql12/doc/src/main/resources/changes.txt
===================================================================
--- trunk/sql12/doc/src/main/resources/changes.txt 2011-05-15 21:00:28 UTC (rev 6261)
+++ trunk/sql12/doc/src/main/resources/changes.txt 2011-05-16 18:22:36 UTC (rev 6262)
@@ -52,6 +52,8 @@
Bug-fixes:
+3137852: DB2 Plugin - The source code is not visible, if a char column contains a default value.
+
3293737: A exception occurs if the value of a SMALLINT column is edited in a result table.
When editing table cells in a text area, the input field for the file name will be shown in an appropriate size
Modified: trunk/sql12/plugins/db2/src/main/java/net/sourceforge/squirrel_sql/plugins/db2/tab/TableSourceTab.java
===================================================================
--- trunk/sql12/plugins/db2/src/main/java/net/sourceforge/squirrel_sql/plugins/db2/tab/TableSourceTab.java 2011-05-15 21:00:28 UTC (rev 6261)
+++ trunk/sql12/plugins/db2/src/main/java/net/sourceforge/squirrel_sql/plugins/db2/tab/TableSourceTab.java 2011-05-16 18:22:36 UTC (rev 6262)
@@ -182,7 +182,10 @@
List<String> sqls = dialect.getCreateTableSQL(tableList, md, prefs, false);
for (String sql : sqls)
{
- tmp.append(sql);
+ /*
+ * If the generated statement contains a ', then escape it.
+ */
+ tmp.append(sql.replace("'", "''"));
tmp.append(statementSeparator);
tmp.append("\n");
tmp.append("\n");
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <man...@us...> - 2011-05-18 01:03:12
|
Revision: 6266
http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=6266&view=rev
Author: manningr
Date: 2011-05-18 01:03:04 +0000 (Wed, 18 May 2011)
Log Message:
-----------
Bug #3303174(Installer hangs on linux) Updated to 4.3.4 version of the izpack compiler. Also, fixed the property format for izpack-standalone-compiler to be consistent with all others.
Modified Paths:
--------------
trunk/sql12/installer/pom.xml
trunk/sql12/pom.xml
Modified: trunk/sql12/installer/pom.xml
===================================================================
--- trunk/sql12/installer/pom.xml 2011-05-18 00:41:30 UTC (rev 6265)
+++ trunk/sql12/installer/pom.xml 2011-05-18 01:03:04 UTC (rev 6266)
@@ -155,7 +155,7 @@
<dependency>
<groupId>org.codehaus.izpack</groupId>
<artifactId>izpack-standalone-compiler</artifactId>
- <version>${izpack-standalone.version}</version>
+ <version>${izpack-standalone-version}</version>
</dependency>
</dependencies>
<configuration>
Modified: trunk/sql12/pom.xml
===================================================================
--- trunk/sql12/pom.xml 2011-05-18 00:41:30 UTC (rev 6265)
+++ trunk/sql12/pom.xml 2011-05-18 01:03:04 UTC (rev 6266)
@@ -89,7 +89,7 @@
<fest-version>1.2.1</fest-version>
<gsbase-version>2.0.1</gsbase-version>
<hibernate-annotations-version>3.3.0.ga</hibernate-annotations-version>
- <izpack-standalone.version>4.3.1</izpack-standalone.version>
+ <izpack-standalone-version>4.3.4</izpack-standalone-version>
<izpack-plugin-version>1.0-alpha-4</izpack-plugin-version>
<junit-version>4.4</junit-version>
<jgoodies-forms-version>1.0.5</jgoodies-forms-version>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <wi...@us...> - 2011-05-25 19:12:23
|
Revision: 6272
http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=6272&view=rev
Author: wis775
Date: 2011-05-25 19:12:16 +0000 (Wed, 25 May 2011)
Log Message:
-----------
Oracle Plugin: Added the ability to show the source of a index
Modified Paths:
--------------
trunk/sql12/doc/src/main/resources/changes.txt
trunk/sql12/plugins/oracle/src/main/java/net/sourceforge/squirrel_sql/plugins/oracle/OraclePlugin.java
trunk/sql12/plugins/oracle/src/main/resources/net/sourceforge/squirrel_sql/plugins/oracle/tab/I18NStrings.properties
Added Paths:
-----------
trunk/sql12/plugins/oracle/src/main/java/net/sourceforge/squirrel_sql/plugins/oracle/tab/IndexSourceTab.java
Modified: trunk/sql12/doc/src/main/resources/changes.txt
===================================================================
--- trunk/sql12/doc/src/main/resources/changes.txt 2011-05-24 00:56:09 UTC (rev 6271)
+++ trunk/sql12/doc/src/main/resources/changes.txt 2011-05-25 19:12:16 UTC (rev 6272)
@@ -7,6 +7,9 @@
Enhancements:
+Oracle Plugin:
+ The DDL of a index could be displayed under the source tab.
+
New plugin "WIKI table configurations":
This plugin provides some pre-defined configurations for various WIKI engines. With this configurations, Squirrel knows, how to transform the selection
of a result table into a WIKI table. At the moment, configurations for the following WIKI's are provided:
Modified: trunk/sql12/plugins/oracle/src/main/java/net/sourceforge/squirrel_sql/plugins/oracle/OraclePlugin.java
===================================================================
--- trunk/sql12/plugins/oracle/src/main/java/net/sourceforge/squirrel_sql/plugins/oracle/OraclePlugin.java 2011-05-24 00:56:09 UTC (rev 6271)
+++ trunk/sql12/plugins/oracle/src/main/java/net/sourceforge/squirrel_sql/plugins/oracle/OraclePlugin.java 2011-05-25 19:12:16 UTC (rev 6272)
@@ -99,6 +99,7 @@
import net.sourceforge.squirrel_sql.plugins.oracle.tab.ConstraintSourceTab;
import net.sourceforge.squirrel_sql.plugins.oracle.tab.IndexColumnInfoTab;
import net.sourceforge.squirrel_sql.plugins.oracle.tab.IndexDetailsTab;
+import net.sourceforge.squirrel_sql.plugins.oracle.tab.IndexSourceTab;
import net.sourceforge.squirrel_sql.plugins.oracle.tab.InstanceDetailsTab;
import net.sourceforge.squirrel_sql.plugins.oracle.tab.LobDetailsTab;
import net.sourceforge.squirrel_sql.plugins.oracle.tab.ObjectSourceTab;
@@ -796,6 +797,7 @@
addDetailTab(objTree, DatabaseObjectType.INDEX, new DatabaseObjectInfoTab());
addDetailTab(objTree, DatabaseObjectType.INDEX, new IndexColumnInfoTab());
addDetailTab(objTree, DatabaseObjectType.INDEX, new IndexDetailsTab());
+ addDetailTab(objTree, DatabaseObjectType.INDEX, new IndexSourceTab());
addDetailTab(objTree, _objectTypes.getLob(), new DatabaseObjectInfoTab());
addDetailTab(objTree, _objectTypes.getLob(), new LobDetailsTab());
addDetailTab(objTree, DatabaseObjectType.SEQUENCE, new DatabaseObjectInfoTab());
Added: trunk/sql12/plugins/oracle/src/main/java/net/sourceforge/squirrel_sql/plugins/oracle/tab/IndexSourceTab.java
===================================================================
--- trunk/sql12/plugins/oracle/src/main/java/net/sourceforge/squirrel_sql/plugins/oracle/tab/IndexSourceTab.java (rev 0)
+++ trunk/sql12/plugins/oracle/src/main/java/net/sourceforge/squirrel_sql/plugins/oracle/tab/IndexSourceTab.java 2011-05-25 19:12:16 UTC (rev 6272)
@@ -0,0 +1,63 @@
+/*
+ * Copyright (C) 2011 Stefan Willinger
+ * wi...@us...
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+package net.sourceforge.squirrel_sql.plugins.oracle.tab;
+
+import java.sql.PreparedStatement;
+import java.sql.SQLException;
+
+import net.sourceforge.squirrel_sql.client.session.ISession;
+import net.sourceforge.squirrel_sql.client.session.mainpanel.objecttree.tabs.BaseSourceTab;
+import net.sourceforge.squirrel_sql.fw.sql.IDatabaseObjectInfo;
+import net.sourceforge.squirrel_sql.fw.sql.ISQLConnection;
+import net.sourceforge.squirrel_sql.fw.util.StringManager;
+import net.sourceforge.squirrel_sql.fw.util.StringManagerFactory;
+
+/**
+ * This class displays the source of a INDEX.
+ * @see http://www.dba-oracle.com/oracle_tips_dbms_metadata.htm
+ * @author Stefan Willinger
+ *
+ */
+public class IndexSourceTab extends BaseSourceTab {
+ private static final StringManager s_stringMgr =
+ StringManagerFactory.getStringManager(IndexSourceTab.class);
+
+ /** SQL that retrieves the source of a index
+ * @see http://www.dba-oracle.com/oracle_tips_dbms_metadata.htm
+ */
+ private static String SQL = "select dbms_metadata.get_ddl('INDEX',?,?) from dual";
+
+ public IndexSourceTab()
+ {
+ // i18n[oracle.showIndexSource=Show index source]
+ super(s_stringMgr.getString("oracle.showIndexSource"));
+ }
+
+ protected PreparedStatement createStatement() throws SQLException
+ {
+ final ISession session = getSession();
+ final IDatabaseObjectInfo doi = getDatabaseObjectInfo();
+
+ ISQLConnection conn = session.getSQLConnection();
+ PreparedStatement pstmt = conn.prepareStatement(SQL);
+ pstmt.setString(1, doi.getSimpleName());
+ pstmt.setString(2, doi.getSchemaName());
+ return pstmt;
+ }
+}
Property changes on: trunk/sql12/plugins/oracle/src/main/java/net/sourceforge/squirrel_sql/plugins/oracle/tab/IndexSourceTab.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Modified: trunk/sql12/plugins/oracle/src/main/resources/net/sourceforge/squirrel_sql/plugins/oracle/tab/I18NStrings.properties
===================================================================
--- trunk/sql12/plugins/oracle/src/main/resources/net/sourceforge/squirrel_sql/plugins/oracle/tab/I18NStrings.properties 2011-05-24 00:56:09 UTC (rev 6271)
+++ trunk/sql12/plugins/oracle/src/main/resources/net/sourceforge/squirrel_sql/plugins/oracle/tab/I18NStrings.properties 2011-05-25 19:12:16 UTC (rev 6272)
@@ -29,4 +29,5 @@
oracle.triggerColumns=Columns
oracle.triggerDetails=Details
oracle.userDetails=Details
+oracle.showIndexSource=Show index source
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ger...@us...> - 2011-05-28 11:06:51
|
Revision: 6274
http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=6274&view=rev
Author: gerdwagner
Date: 2011-05-28 11:06:44 +0000 (Sat, 28 May 2011)
Log Message:
-----------
Query Builder clean up
Modified Paths:
--------------
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/objecttree/ObjectTreeDndTransfer.java
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/objecttree/ObjectTreePanel.java
trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/AddToGraphAction.java
trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/GraphController.java
trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/GraphDesktopController.java
trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/GraphDesktopPane.java
trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/GraphPanelController.java
trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/GraphPlugin.java
trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/GraphPluginResources.java
trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/NewQueryBuilderWindowAction.java
trunk/sql12/plugins/graph/src/main/resources/net/sourceforge/squirrel_sql/plugins/graph/GraphPluginResources.properties
trunk/sql12/plugins/graph/src/main/resources/net/sourceforge/squirrel_sql/plugins/graph/I18NStrings.properties
Added Paths:
-----------
trunk/sql12/plugins/graph/src/main/resources/net/sourceforge/squirrel_sql/plugins/graph/images/dnd.png
Modified: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/objecttree/ObjectTreeDndTransfer.java
===================================================================
--- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/objecttree/ObjectTreeDndTransfer.java 2011-05-28 08:46:10 UTC (rev 6273)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/objecttree/ObjectTreeDndTransfer.java 2011-05-28 11:06:44 UTC (rev 6274)
@@ -1,5 +1,6 @@
package net.sourceforge.squirrel_sql.client.session.mainpanel.objecttree;
+import net.sourceforge.squirrel_sql.fw.id.IIdentifier;
import net.sourceforge.squirrel_sql.fw.sql.ITableInfo;
import java.util.List;
@@ -11,14 +12,21 @@
public class ObjectTreeDndTransfer
{
private List<ITableInfo> _selectedTables;
+ private IIdentifier _sessionIdentifier;
- public ObjectTreeDndTransfer(List<ITableInfo> selectedTables)
+ public ObjectTreeDndTransfer(List<ITableInfo> selectedTables, IIdentifier sessionIdentifier)
{
_selectedTables = selectedTables;
+ _sessionIdentifier = sessionIdentifier;
}
public List<ITableInfo> getSelectedTables()
{
return _selectedTables;
}
+
+ public IIdentifier getSessionIdentifier()
+ {
+ return _sessionIdentifier;
+ }
}
Modified: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/objecttree/ObjectTreePanel.java
===================================================================
--- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/objecttree/ObjectTreePanel.java 2011-05-28 08:46:10 UTC (rev 6273)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/objecttree/ObjectTreePanel.java 2011-05-28 11:06:44 UTC (rev 6274)
@@ -143,7 +143,7 @@
@Override
protected Transferable createTransferable(JComponent c)
{
- return new DataHandler(new ObjectTreeDndTransfer(getSelectedTables()), DataFlavor.javaJVMLocalObjectMimeType);
+ return new DataHandler(new ObjectTreeDndTransfer(getSelectedTables(), _session.getIdentifier()), DataFlavor.javaJVMLocalObjectMimeType);
}
public int getSourceActions(JComponent c)
Modified: trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/AddToGraphAction.java
===================================================================
--- trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/AddToGraphAction.java 2011-05-28 08:46:10 UTC (rev 6273)
+++ trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/AddToGraphAction.java 2011-05-28 11:06:44 UTC (rev 6274)
@@ -9,8 +9,6 @@
import net.sourceforge.squirrel_sql.fw.sql.DatabaseObjectType;
import java.awt.event.ActionEvent;
-import java.awt.*;
-import java.util.Vector;
public class AddToGraphAction extends SquirrelAction implements ISessionAction
@@ -50,7 +48,7 @@
GraphController[] controllers = _plugin.getGraphControllers(_session);
if (0 == controllers.length)
{
- toAddTo = _plugin.createNewGraphControllerForSession(_session);
+ toAddTo = _plugin.createNewGraphControllerForSession(_session, false);
}
else
{
@@ -63,7 +61,7 @@
}
if(null == dlg.getSelectedController())
{
- toAddTo = _plugin.createNewGraphControllerForSession(_session);
+ toAddTo = _plugin.createNewGraphControllerForSession(_session, false);
}
else
{
Modified: trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/GraphController.java
===================================================================
--- trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/GraphController.java 2011-05-28 08:46:10 UTC (rev 6273)
+++ trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/GraphController.java 2011-05-28 11:06:44 UTC (rev 6274)
@@ -28,7 +28,7 @@
private TabToWindowHandler _tabToWindowHandler;
private GraphXmlSerializer _xmlSerializer;
- public GraphController(ISession session, GraphPlugin plugin, GraphXmlSerializer xmlSerializer)
+ public GraphController(ISession session, GraphPlugin plugin, GraphXmlSerializer xmlSerializer, boolean showDndDesktopImageAtStartup)
{
_session = session;
_plugin = plugin;
@@ -99,7 +99,7 @@
}
};
- _panelController = new GraphPanelController(_tableFramesModel, _graphDesktopListener, _session, _plugin);
+ _panelController = new GraphPanelController(_tableFramesModel, _graphDesktopListener, _session, _plugin, showDndDesktopImageAtStartup);
_tabToWindowHandler = new TabToWindowHandler(_panelController, _session, _plugin);
Modified: trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/GraphDesktopController.java
===================================================================
--- trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/GraphDesktopController.java 2011-05-28 08:46:10 UTC (rev 6273)
+++ trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/GraphDesktopController.java 2011-05-28 11:06:44 UTC (rev 6274)
@@ -50,13 +50,13 @@
private GraphControllerPopupListener _currentGraphControllerPopupListener;
- public GraphDesktopController(GraphDesktopListener listener, ISession session, GraphPlugin plugin, ModeManager modeManager)
+ public GraphDesktopController(GraphDesktopListener listener, ISession session, GraphPlugin plugin, ModeManager modeManager, boolean showDndDesktopImageAtStartup)
{
_listener = listener;
_session = session;
_plugin = plugin;
_graphPluginResources = new GraphPluginResources(_plugin);
- _desktopPane = new GraphDesktopPane(_session.getApplication());
+ _desktopPane = new GraphDesktopPane(_session.getApplication(), _graphPluginResources.getIcon(GraphPluginResources.IKeys.DND));
_desktopPane.setBackground(Color.white);
_modeManager = modeManager;
@@ -120,6 +120,16 @@
if(transferData instanceof ObjectTreeDndTransfer)
{
ObjectTreeDndTransfer objectTreeDndTransfer = (ObjectTreeDndTransfer) transferData;
+
+ if(false == objectTreeDndTransfer.getSessionIdentifier().equals(_session.getIdentifier()))
+ {
+ JOptionPane.showMessageDialog(SwingUtilities.windowForComponent(_desktopPane), s_stringMgr.getString("GraphDesktopController.tableDropedFormOtherSession"));
+ return;
+ }
+
+
+
+
_listener.tablesDropped(objectTreeDndTransfer.getSelectedTables(), dtde.getLocation());
}
@@ -625,6 +635,7 @@
public void addFrame(JInternalFrame frame)
{
+ _desktopPane.hideStartupImage();
_desktopPane.add(frame);
}
Modified: trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/GraphDesktopPane.java
===================================================================
--- trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/GraphDesktopPane.java 2011-05-28 08:46:10 UTC (rev 6273)
+++ trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/GraphDesktopPane.java 2011-05-28 11:06:44 UTC (rev 6274)
@@ -17,7 +17,7 @@
import java.util.Set;
import java.util.Vector;
-import javax.swing.RepaintManager;
+import javax.swing.*;
import net.sourceforge.squirrel_sql.client.IApplication;
import net.sourceforge.squirrel_sql.client.gui.desktopcontainer.ScrollableDesktopPane;
@@ -39,12 +39,23 @@
private double _formatHeightInPixel;
private double _formatScale;
private boolean _isPrinting;
+ private ImageIcon _desktopImage;
+ private boolean _showStartupImage;
//
/////////////////////////////////////////////////////////
- public GraphDesktopPane(IApplication app)
+ public GraphDesktopPane(IApplication app, ImageIcon desktopImage)
{
super(app);
+
+ _desktopImage = desktopImage;
+
+ if(null != _desktopImage)
+ {
+ _showStartupImage = true;
+ }
+
+
_constraintViewListener = new ConstraintViewAdapter()
{
public void foldingPointMoved(ConstraintView source)
@@ -124,11 +135,26 @@
super.paintComponent(g);
super.paintBorder(g);
+ paintStartupImage(g);
+
paintGraphComponents(g);
super.paintChildren(g);
}
+ private void paintStartupImage(Graphics g)
+ {
+ if (_showStartupImage)
+ {
+ Dimension size = getSize();
+
+ int x= (size.width - _desktopImage.getIconWidth())/2;
+ int y= (size.height - _desktopImage.getIconHeight())/2;
+
+ g.drawImage(_desktopImage.getImage(), x, y, null);
+ }
+ }
+
private void paintGraphComponents(Graphics g)
{
for (int i = 0; i < _graphComponents.size(); i++)
@@ -295,4 +321,9 @@
///////////////////////////////////////////////////////////////////////////////////////
+ public void hideStartupImage()
+ {
+ _showStartupImage = false;
+ repaint();
+ }
}
Modified: trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/GraphPanelController.java
===================================================================
--- trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/GraphPanelController.java 2011-05-28 08:46:10 UTC (rev 6273)
+++ trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/GraphPanelController.java 2011-05-28 11:06:44 UTC (rev 6274)
@@ -18,7 +18,7 @@
private JPanel _bottomPanelContainer;
private int _standardDividerSize;
- public GraphPanelController(TableFramesModel tableFramesModel, GraphDesktopListener graphDesktopListener, ISession session, GraphPlugin plugin)
+ public GraphPanelController(TableFramesModel tableFramesModel, GraphDesktopListener graphDesktopListener, ISession session, GraphPlugin plugin, boolean showDndDesktopImageAtStartup)
{
GraphControllerFacade graphControllerFacade = new GraphControllerFacade()
{
@@ -54,7 +54,7 @@
};
_modeManager = new ModeManager(tableFramesModel, session, plugin, graphControllerFacade);
- _graphDesktopController = new GraphDesktopController(graphDesktopListener, session, plugin, _modeManager);
+ _graphDesktopController = new GraphDesktopController(graphDesktopListener, session, plugin, _modeManager, showDndDesktopImageAtStartup);
JScrollPane scrollPane = new JScrollPane(_graphDesktopController.getDesktopPane());
Modified: trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/GraphPlugin.java
===================================================================
--- trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/GraphPlugin.java 2011-05-28 08:46:10 UTC (rev 6273)
+++ trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/GraphPlugin.java 2011-05-28 11:06:44 UTC (rev 6274)
@@ -30,7 +30,6 @@
import net.sourceforge.squirrel_sql.plugins.graph.xmlbeans.GraphXmlSerializer;
import java.util.Arrays;
-import java.util.HashMap;
import java.util.Hashtable;
import java.util.Vector;
@@ -173,7 +172,7 @@
for (int i = 0; i < controllers.length; i++)
{
- controllers[i] = new GraphController(session, this, serializers[i]);
+ controllers[i] = new GraphController(session, this, serializers[i], false);
}
@@ -264,7 +263,7 @@
}
}
- public GraphController createNewGraphControllerForSession(ISession session)
+ public GraphController createNewGraphControllerForSession(ISession session, boolean showDndDesktopImageAtStartup)
{
GraphController[] controllers = _grapControllersBySessionID.get(session.getIdentifier());
@@ -273,7 +272,7 @@
{
v.addAll(Arrays.asList(controllers));
}
- GraphController ret = new GraphController(session, this, null);
+ GraphController ret = new GraphController(session, this, null, showDndDesktopImageAtStartup);
v.add(ret);
controllers = v.toArray(new GraphController[v.size()]);
Modified: trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/GraphPluginResources.java
===================================================================
--- trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/GraphPluginResources.java 2011-05-28 08:46:10 UTC (rev 6273)
+++ trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/GraphPluginResources.java 2011-05-28 11:06:44 UTC (rev 6274)
@@ -43,5 +43,6 @@
String NEW_AND_FOLDER = "newandfolder";
String NEW_OR_FOLDER = "neworfolder";
String DELETE_FOLDER = "deletefolder";
+ String DND = "dnd";
}
}
Modified: trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/NewQueryBuilderWindowAction.java
===================================================================
--- trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/NewQueryBuilderWindowAction.java 2011-05-28 08:46:10 UTC (rev 6273)
+++ trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/NewQueryBuilderWindowAction.java 2011-05-28 11:06:44 UTC (rev 6274)
@@ -22,7 +22,7 @@
@Override
public void actionPerformed(ActionEvent e)
{
- GraphController gc = _graphPlugin.createNewGraphControllerForSession(_session);
+ GraphController gc = _graphPlugin.createNewGraphControllerForSession(_session, true);
gc.showQueryBuilderInWindowBesidesObjectTree();
}
Modified: trunk/sql12/plugins/graph/src/main/resources/net/sourceforge/squirrel_sql/plugins/graph/GraphPluginResources.properties
===================================================================
--- trunk/sql12/plugins/graph/src/main/resources/net/sourceforge/squirrel_sql/plugins/graph/GraphPluginResources.properties 2011-05-28 08:46:10 UTC (rev 6273)
+++ trunk/sql12/plugins/graph/src/main/resources/net/sourceforge/squirrel_sql/plugins/graph/GraphPluginResources.properties 2011-05-28 11:06:44 UTC (rev 6274)
@@ -38,6 +38,7 @@
sort_asc.image=sort_asc.gif
sort_desc.image=sort_desc.gif
sort.image=sort.png
+dnd.image=dnd.png
Modified: trunk/sql12/plugins/graph/src/main/resources/net/sourceforge/squirrel_sql/plugins/graph/I18NStrings.properties
===================================================================
--- trunk/sql12/plugins/graph/src/main/resources/net/sourceforge/squirrel_sql/plugins/graph/I18NStrings.properties 2011-05-28 08:46:10 UTC (rev 6273)
+++ trunk/sql12/plugins/graph/src/main/resources/net/sourceforge/squirrel_sql/plugins/graph/I18NStrings.properties 2011-05-28 11:06:44 UTC (rev 6274)
@@ -218,4 +218,6 @@
Sorting.sortedDesc=Order descending
Sorting.sortedDescTT=Column will appear as DESC in ORDER BY clause
-TableFrameController.tableDoesNotExist=The table {0} does not exist anymore in the database but is still used in one or more Graphs. Several Graph functions will not work correctly anymore for these Graph.
\ No newline at end of file
+TableFrameController.tableDoesNotExist=The table {0} does not exist anymore in the database but is still used in one or more Graphs. Several Graph functions will not work correctly anymore for these Graph.
+
+GraphDesktopController.tableDropedFormOtherSession=Tables from one Session can not be dropped at Graphs from another Session.
\ No newline at end of file
Added: trunk/sql12/plugins/graph/src/main/resources/net/sourceforge/squirrel_sql/plugins/graph/images/dnd.png
===================================================================
(Binary files differ)
Property changes on: trunk/sql12/plugins/graph/src/main/resources/net/sourceforge/squirrel_sql/plugins/graph/images/dnd.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <wi...@us...> - 2011-05-28 19:52:41
|
Revision: 6276
http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=6276&view=rev
Author: wis775
Date: 2011-05-28 19:52:34 +0000 (Sat, 28 May 2011)
Log Message:
-----------
Feature Request: 3307812: Select an entire row via the table's pop-up menu.
Modified Paths:
--------------
trunk/sql12/doc/src/main/resources/changes.txt
trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/gui/TablePopupMenu.java
trunk/sql12/fw/src/main/resources/net/sourceforge/squirrel_sql/fw/gui/I18NStrings.properties
Added Paths:
-----------
trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/gui/action/AbstractTableDependedCommand.java
trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/gui/action/TableSelectEntireRowsCommand.java
trunk/sql12/fw/src/test/java/net/sourceforge/squirrel_sql/fw/gui/action/TableSelectEntireRowsCommandTest.java
Modified: trunk/sql12/doc/src/main/resources/changes.txt
===================================================================
--- trunk/sql12/doc/src/main/resources/changes.txt 2011-05-28 19:01:17 UTC (rev 6275)
+++ trunk/sql12/doc/src/main/resources/changes.txt 2011-05-28 19:52:34 UTC (rev 6276)
@@ -7,9 +7,11 @@
Enhancements:
+Feature Request: 3307812: Select an entire row via the table's pop-up menu.
+
Oracle Plugin:
The DDL of a index could be displayed under the source tab.
-
+
New plugin "WIKI table configurations":
This plugin provides some pre-defined configurations for various WIKI engines. With this configurations, Squirrel knows, how to transform the selection
of a result table into a WIKI table. At the moment, configurations for the following WIKI's are provided:
Modified: trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/gui/TablePopupMenu.java
===================================================================
--- trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/gui/TablePopupMenu.java 2011-05-28 19:01:17 UTC (rev 6275)
+++ trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/gui/TablePopupMenu.java 2011-05-28 19:52:34 UTC (rev 6276)
@@ -64,7 +64,8 @@
int ALWAYS_ADJUST_ALL_COL_WIDTHS_ACTION = 10;
int SHOW_ROW_NUMBERS = 11;
int COPY_WIKI = 12;
- int LAST_ENTRY = 13;
+ int SELECT_ROWS = 13;
+ int LAST_ENTRY = 14;
}
private static final KeyStroke COPY_STROKE = KeyStroke.getKeyStroke(KeyEvent.VK_C, KeyEvent.CTRL_DOWN_MASK);
@@ -95,6 +96,7 @@
private DeleteRowsAction _deleteRows = new DeleteRowsAction();
private InsertRowAction _insertRow = new InsertRowAction();
private SelectAllAction _select = new SelectAllAction();
+ private SelectRowsAction _selectRows = new SelectRowsAction();
private PrintAction _print = new PrintAction();
@@ -174,6 +176,9 @@
}
addSeparator();
_menuItems[IOptionTypes.SELECT_ALL] = add(_select);
+
+ _menuItems[IOptionTypes.SELECT_ROWS] = add(_selectRows);
+
// add entries for insert and delete rows
// only if table is updateable and already editable (ie. allowEditing is false)
@@ -612,7 +617,29 @@
}
}
+ /**
+ * Select the entire rows of the current selection.
+ * @author Stefan Willinger
+ *
+ */
+ private class SelectRowsAction extends BaseAction
+ {
+ SelectRowsAction()
+ {
+ super(s_stringMgr.getString("TablePopupMenu.selectEntireRows"));
+ }
+
+ public void actionPerformed(ActionEvent evt)
+ {
+ if (_table != null)
+ {
+ new TableSelectEntireRowsCommand(_table).execute();
+ }
+ }
+ }
+
+
private class PrintAction extends BaseAction
{
/**
Added: trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/gui/action/AbstractTableDependedCommand.java
===================================================================
--- trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/gui/action/AbstractTableDependedCommand.java (rev 0)
+++ trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/gui/action/AbstractTableDependedCommand.java 2011-05-28 19:52:34 UTC (rev 6276)
@@ -0,0 +1,57 @@
+/*
+ * Copyright (C) 2011 Stefan Willinger
+ * wi...@us...
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+package net.sourceforge.squirrel_sql.fw.gui.action;
+
+import javax.swing.JTable;
+
+import net.sourceforge.squirrel_sql.fw.util.ICommand;
+
+/**
+ * Abstract base class for commands, which depends on a {@link JTable}
+ * @author Stefan Willinger
+ *
+ */
+public abstract class AbstractTableDependedCommand implements ICommand{
+ private JTable table;
+
+ public AbstractTableDependedCommand(JTable table)
+ {
+ super();
+ setTable(table);
+
+ }
+
+ /**
+ * @return the _table
+ */
+ public JTable getTable() {
+ return this.table;
+ }
+
+ /**
+ * @param _table the _table to set
+ */
+ public void setTable(JTable table) {
+ if (table == null)
+ {
+ throw new IllegalArgumentException("JTable == null");
+ }
+ this.table = table;
+ }
+}
Property changes on: trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/gui/action/AbstractTableDependedCommand.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/gui/action/TableSelectEntireRowsCommand.java
===================================================================
--- trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/gui/action/TableSelectEntireRowsCommand.java (rev 0)
+++ trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/gui/action/TableSelectEntireRowsCommand.java 2011-05-28 19:52:34 UTC (rev 6276)
@@ -0,0 +1,42 @@
+/*
+ * Copyright (C) 2011 Stefan Willinger
+ * wi...@us...
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+package net.sourceforge.squirrel_sql.fw.gui.action;
+
+import javax.swing.JTable;
+
+/**
+ * Command to expand the current selection of a table to span the complete affected rows.
+ * @author Stefan Willinger
+ *
+ */
+/**
+ * @author Stefan Willinger
+ *
+ */
+public class TableSelectEntireRowsCommand extends AbstractTableDependedCommand{
+
+ public TableSelectEntireRowsCommand(JTable table) {
+ super(table);
+ }
+
+ @Override
+ public void execute(){
+ getTable().setColumnSelectionInterval(0, getTable().getColumnCount()-1);
+ }
+}
Property changes on: trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/gui/action/TableSelectEntireRowsCommand.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Modified: trunk/sql12/fw/src/main/resources/net/sourceforge/squirrel_sql/fw/gui/I18NStrings.properties
===================================================================
--- trunk/sql12/fw/src/main/resources/net/sourceforge/squirrel_sql/fw/gui/I18NStrings.properties 2011-05-28 19:01:17 UTC (rev 6275)
+++ trunk/sql12/fw/src/main/resources/net/sourceforge/squirrel_sql/fw/gui/I18NStrings.properties 2011-05-28 19:52:34 UTC (rev 6276)
@@ -49,6 +49,7 @@
TablePopupMenu.insertrow=Insert Row
TablePopupMenu.paste=Paste
TablePopupMenu.selectall=Select All
+TablePopupMenu.selectEntireRows=Select entire row(s)
TablePopupMenu.print=Print
TextPopupMenu.copy=Copy
Added: trunk/sql12/fw/src/test/java/net/sourceforge/squirrel_sql/fw/gui/action/TableSelectEntireRowsCommandTest.java
===================================================================
--- trunk/sql12/fw/src/test/java/net/sourceforge/squirrel_sql/fw/gui/action/TableSelectEntireRowsCommandTest.java (rev 0)
+++ trunk/sql12/fw/src/test/java/net/sourceforge/squirrel_sql/fw/gui/action/TableSelectEntireRowsCommandTest.java 2011-05-28 19:52:34 UTC (rev 6276)
@@ -0,0 +1,85 @@
+/*
+ * Copyright (C) 2011 Stefan Willinger
+ * wi...@us...
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+package net.sourceforge.squirrel_sql.fw.gui.action;
+
+
+import static org.junit.Assert.assertEquals;
+
+import java.lang.reflect.Method;
+
+import javax.swing.JTable;
+
+import org.fest.assertions.AssertExtension;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.runners.MockitoJUnitRunner;
+
+
+/**
+ * Tests the selection of a full row(s).
+ * @author Stefan Willinger
+ *
+ */
+public class TableSelectEntireRowsCommandTest {
+
+ private JTable table;
+
+ private TableSelectEntireRowsCommand classUnderTest = null;
+
+ @Before
+ public void setup() {
+ String[][] rowData = new String[][]{
+ {"Austria", "Vienna"},
+ {"Italy", "Rome"},
+ {"Germany", "Berlin"}
+ };
+
+ String[] columnNames = new String[]{"Country", "Capital"};
+
+ table = new JTable(rowData, columnNames);
+ classUnderTest = new TableSelectEntireRowsCommand(table);
+ }
+
+ @Test
+ public void testSelectSingleRow() throws Exception {
+ table.setRowSelectionInterval(0, 0);
+ table.setColumnSelectionInterval(0, 0);
+
+ classUnderTest.execute();
+
+ assertEquals(0, table.getSelectedRows()[0]);
+ assertEquals(2, table.getSelectedColumnCount());
+ assertEquals(1, table.getSelectedRowCount());
+ }
+
+ @Test
+ public void testSelectMultibleRows() throws Exception {
+ table.setRowSelectionInterval(1, 2);
+ table.setColumnSelectionInterval(1, 1);
+
+ classUnderTest.execute();
+
+ assertEquals(1, table.getSelectedRows()[0]);
+ assertEquals(2, table.getSelectedRows()[1]);
+ assertEquals(2, table.getSelectedColumnCount());
+ assertEquals(2, table.getSelectedRowCount());
+ }
+}
Property changes on: trunk/sql12/fw/src/test/java/net/sourceforge/squirrel_sql/fw/gui/action/TableSelectEntireRowsCommandTest.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ger...@us...> - 2011-05-29 11:45:08
|
Revision: 6277
http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=6277&view=rev
Author: gerdwagner
Date: 2011-05-29 11:45:01 +0000 (Sun, 29 May 2011)
Log Message:
-----------
Query Builder clean up
Modified Paths:
--------------
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/session/MainPanel.java
trunk/sql12/doc/src/main/resources/changes.txt
trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/GraphController.java
trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/GraphDesktopController.java
trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/GraphMainPanelTab.java
trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/GraphPlugin.java
trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/window/TabToWindowHandler.java
Added Paths:
-----------
trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/LazyLoadListener.java
Modified: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/session/MainPanel.java
===================================================================
--- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/session/MainPanel.java 2011-05-28 19:52:34 UTC (rev 6276)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/session/MainPanel.java 2011-05-29 11:45:01 UTC (rev 6277)
@@ -295,6 +295,7 @@
return idx;
}
+ _tabs.remove(idx);
_tabPnl.removeTabAt(idx);
return idx;
Modified: trunk/sql12/doc/src/main/resources/changes.txt
===================================================================
--- trunk/sql12/doc/src/main/resources/changes.txt 2011-05-28 19:52:34 UTC (rev 6276)
+++ trunk/sql12/doc/src/main/resources/changes.txt 2011-05-29 11:45:01 UTC (rev 6277)
@@ -7,6 +7,15 @@
Enhancements:
+Query Builder / New features in Graph plugin:
+ The Query Builder is part of the Graph plugin. That means besides the former default and Zoom/Print modes
+ Query Builder is a new mode of the Graph Plugin. Any existing Graph can be switched to the new mode.
+ Besides the Query Builder itself several new features have been added to the Graph plugin:
+ - A Graph can be viewed in separate window.
+ - Tables can be dragged from the Object tree to a Graph window. For convenience there is a
+ new Session tool bar button that creates a new Graph window and places it right besides the Session's Object tree.
+ - Graphs have a Kick off/Start button on the lower left of a Graph panel to give more intuitive access to Graph functions.
+
Feature Request: 3307812: Select an entire row via the table's pop-up menu.
Oracle Plugin:
@@ -48,7 +57,7 @@
Feature requests 3001253, 2896494: New icons in Object tree
-Display errors in result tab:
+Display errors in result tab (Feature requests 2826179):
SQL execution errors are now additionally displayed in a temporary result tab.
- This new feature is switched on by default and can be switched off in
Menu File --> New Session Properties --> Tab SQL --> Show SQL execution errors in result tab.
Modified: trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/GraphController.java
===================================================================
--- trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/GraphController.java 2011-05-28 19:52:34 UTC (rev 6276)
+++ trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/GraphController.java 2011-05-29 11:45:01 UTC (rev 6277)
@@ -27,6 +27,7 @@
private GraphPlugin _plugin;
private TabToWindowHandler _tabToWindowHandler;
private GraphXmlSerializer _xmlSerializer;
+ private boolean _lazyLoadDone;
public GraphController(ISession session, GraphPlugin plugin, GraphXmlSerializer xmlSerializer, boolean showDndDesktopImageAtStartup)
{
@@ -143,10 +144,25 @@
_panelController.initMode(Mode.DEFAULT, null, null, false, null, null);
}
- _tabToWindowHandler.showGraph();
- if(null != graphControllerXmlBean)
+ final GraphControllerXmlBean finalGraphControllerXmlBean = graphControllerXmlBean;
+
+ LazyLoadListener lazyLoadListener = new LazyLoadListener()
{
+ @Override
+ public void lazyLoadTables()
+ {
+ onLazyLoadTables(finalGraphControllerXmlBean);
+ }
+ };
+ _tabToWindowHandler.showGraph(lazyLoadListener);
+ }
+
+ private void onLazyLoadTables(GraphControllerXmlBean graphControllerXmlBean)
+ {
+ if(null != graphControllerXmlBean && false == _lazyLoadDone)
+ {
+ _lazyLoadDone = true;
TableFrameControllerXmlBean[] tableFrameControllerXmls = graphControllerXmlBean.getTableFrameControllerXmls();
for (int i = 0; i < tableFrameControllerXmls.length; i++)
{
Modified: trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/GraphDesktopController.java
===================================================================
--- trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/GraphDesktopController.java 2011-05-28 19:52:34 UTC (rev 6276)
+++ trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/GraphDesktopController.java 2011-05-29 11:45:01 UTC (rev 6277)
@@ -56,7 +56,15 @@
_session = session;
_plugin = plugin;
_graphPluginResources = new GraphPluginResources(_plugin);
- _desktopPane = new GraphDesktopPane(_session.getApplication(), _graphPluginResources.getIcon(GraphPluginResources.IKeys.DND));
+
+ ImageIcon startUpImage = null;
+
+ if (showDndDesktopImageAtStartup)
+ {
+ startUpImage = _graphPluginResources.getIcon(GraphPluginResources.IKeys.DND);
+ }
+
+ _desktopPane = new GraphDesktopPane(_session.getApplication(), startUpImage);
_desktopPane.setBackground(Color.white);
_modeManager = modeManager;
Modified: trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/GraphMainPanelTab.java
===================================================================
--- trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/GraphMainPanelTab.java 2011-05-28 19:52:34 UTC (rev 6276)
+++ trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/GraphMainPanelTab.java 2011-05-29 11:45:01 UTC (rev 6277)
@@ -14,12 +14,13 @@
StringManagerFactory.getStringManager(GraphMainPanelTab.class);
private GraphPanelController _panelController;
- // i18n[graph.newGraph=New table graph]
+ // i18n[graph.newGraph=New table graph]
private JPanel _tabComponent;
private JLabel _lblTitle;
private JButton _btnToWindow;
+ private LazyLoadListener _lazyLoadListener;
public GraphMainPanelTab(GraphPanelController panelController, GraphPlugin plugin)
{
@@ -43,6 +44,7 @@
protected void refreshComponent()
{
_panelController.repaint();
+ _lazyLoadListener.lazyLoadTables();
}
public String getTitle()
@@ -82,4 +84,9 @@
{
_panelController.removeGraph();
}
+
+ public void setLazyLoadListener(LazyLoadListener lazyLoadListener)
+ {
+ _lazyLoadListener = lazyLoadListener;
+ }
}
Modified: trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/GraphPlugin.java
===================================================================
--- trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/GraphPlugin.java 2011-05-28 19:52:34 UTC (rev 6276)
+++ trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/GraphPlugin.java 2011-05-29 11:45:01 UTC (rev 6277)
@@ -76,7 +76,7 @@
*/
public String getVersion()
{
- return "1.0";
+ return "2.0";
}
/**
Added: trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/LazyLoadListener.java
===================================================================
--- trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/LazyLoadListener.java (rev 0)
+++ trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/LazyLoadListener.java 2011-05-29 11:45:01 UTC (rev 6277)
@@ -0,0 +1,6 @@
+package net.sourceforge.squirrel_sql.plugins.graph;
+
+public interface LazyLoadListener
+{
+ void lazyLoadTables();
+}
Modified: trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/window/TabToWindowHandler.java
===================================================================
--- trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/window/TabToWindowHandler.java 2011-05-28 19:52:34 UTC (rev 6276)
+++ trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/window/TabToWindowHandler.java 2011-05-29 11:45:01 UTC (rev 6277)
@@ -5,6 +5,7 @@
import net.sourceforge.squirrel_sql.plugins.graph.GraphMainPanelTab;
import net.sourceforge.squirrel_sql.plugins.graph.GraphPanelController;
import net.sourceforge.squirrel_sql.plugins.graph.GraphPlugin;
+import net.sourceforge.squirrel_sql.plugins.graph.LazyLoadListener;
import java.awt.*;
import java.awt.event.ActionEvent;
@@ -15,6 +16,7 @@
private GraphMainPanelTab _graphMainPanelTab;
private ISession _session;
private GraphWindowController _graphWindowController;
+ private LazyLoadListener _lazyLoadListener;
public TabToWindowHandler(GraphPanelController panelController, ISession session, GraphPlugin plugin)
{
@@ -32,6 +34,8 @@
private void toWindow()
{
+ _lazyLoadListener.lazyLoadTables();
+
Dimension size = _graphMainPanelTab.getComponent().getSize();
Point screenLoc = GUIUtils.getScreenLocationFor(_graphMainPanelTab.getComponent());
@@ -77,8 +81,10 @@
}
- public void showGraph()
+ public void showGraph(LazyLoadListener lazyLoadListener)
{
+ _lazyLoadListener = lazyLoadListener;
+ _graphMainPanelTab.setLazyLoadListener(_lazyLoadListener);
_session.getSessionSheet().addMainTab(_graphMainPanelTab);
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <wi...@us...> - 2011-06-01 18:03:50
|
Revision: 6280
http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=6280&view=rev
Author: wis775
Date: 2011-06-01 18:03:44 +0000 (Wed, 01 Jun 2011)
Log Message:
-----------
Bug: 3309565Hard to understand SQL connection error message
The error messages are now defined in resource bundles. So they can be translated.
Modified Paths:
--------------
trunk/sql12/doc/src/main/resources/changes.txt
trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/sql/SQLConnectionState.java
trunk/sql12/fw/src/main/resources/net/sourceforge/squirrel_sql/fw/sql/I18NStrings.properties
Modified: trunk/sql12/doc/src/main/resources/changes.txt
===================================================================
--- trunk/sql12/doc/src/main/resources/changes.txt 2011-05-29 19:58:08 UTC (rev 6279)
+++ trunk/sql12/doc/src/main/resources/changes.txt 2011-06-01 18:03:44 UTC (rev 6280)
@@ -66,6 +66,8 @@
Bug-fixes:
+3309565: Not possible to translate SQL connection error messages, because they are hard coded.
+
3303174: Installer hangs on linux. Updated version of IzPack compiler to 4.3.4.
3137852: DB2 Plugin - The source code is not visible, if a char column contains a default value.
Modified: trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/sql/SQLConnectionState.java
===================================================================
--- trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/sql/SQLConnectionState.java 2011-05-29 19:58:08 UTC (rev 6279)
+++ trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/sql/SQLConnectionState.java 2011-06-01 18:03:44 UTC (rev 6280)
@@ -21,6 +21,8 @@
import net.sourceforge.squirrel_sql.fw.util.IMessageHandler;
import net.sourceforge.squirrel_sql.fw.util.ISessionProperties;
+import net.sourceforge.squirrel_sql.fw.util.StringManager;
+import net.sourceforge.squirrel_sql.fw.util.StringManagerFactory;
import net.sourceforge.squirrel_sql.fw.util.log.ILogger;
import net.sourceforge.squirrel_sql.fw.util.log.LoggerController;
@@ -33,6 +35,9 @@
*/
public class SQLConnectionState
{
+ /** Internationalized strings for this class. */
+ private static final StringManager s_stringMgr = StringManagerFactory.getStringManager(SQLConnectionState.class);
+
private final static ILogger s_log =
LoggerController.createLogger(SQLConnectionState.class);
@@ -60,10 +65,13 @@
}
catch (SQLException ex)
{
- String msg =
- "Error saving transaction isolation.\n" +
- "This might happen when reconnecting a Session to restore a broken connection.\n" +
- "The new connection will use the default transaction isolation.";
+ /*
+ * i18n [SQLConnectionState.errorSavingIsolationState]
+ * Error saving transaction isolation.\n" +
+ * "This might happen when reconnecting a Session to restore a broken connection.\n" +
+ * "The new connection will use the default transaction isolation.";
+ */
+ String msg = s_stringMgr.getString("SQLConnectionState.errorSavingIsolationState");
s_log.error(msg, ex);
if (msgHandler == null)
@@ -79,10 +87,13 @@
}
catch (SQLException ex)
{
- String msg =
+ /*
+ * i18n [SQLConnectionState.errorSavingCatalog]
"Error saving current catalog.\n" +
"This might happen when reconnecting a Session to restore a broken connection.\n" +
"The new connection will use the default catalog.";
+ */
+ String msg = s_stringMgr.getString("SQLConnectionState.errorSavingCatalog");
s_log.error(msg, ex);
if (msgHandler == null)
@@ -102,12 +113,14 @@
}
catch (SQLException ex)
{
- String msg =
+ /*
+ * i18n [SQLConnectionState.errorSavingAutoCommit]
"Error saving autocommit state.\n" +
"This might happen when reconnecting a Session to restore a broken connection.\n" +
"The new connection will use the autocommit state.";
+ */
+ String msg = s_stringMgr.getString("SQLConnectionState.errorSavingAutoCommit");
-
s_log.error(msg, ex);
if (msgHandler == null)
{
Modified: trunk/sql12/fw/src/main/resources/net/sourceforge/squirrel_sql/fw/sql/I18NStrings.properties
===================================================================
--- trunk/sql12/fw/src/main/resources/net/sourceforge/squirrel_sql/fw/sql/I18NStrings.properties 2011-05-29 19:58:08 UTC (rev 6279)
+++ trunk/sql12/fw/src/main/resources/net/sourceforge/squirrel_sql/fw/sql/I18NStrings.properties 2011-06-01 18:03:44 UTC (rev 6280)
@@ -77,3 +77,7 @@
DatabaseObjectType.TRIGGER_TYPE_DBO=Trigger Type
DatabaseObjectType.UDT_TYPE_DBO=UDT Type
DatabaseObjectType.UDF_TYPE_DBO=UDF Type
+
+SQLConnectionState.errorSavingIsolationState=Error saving transaction isolation.\nThis might happen when reconnecting a Session to restore a broken connection.\nThe new connection will use the default transaction isolation.
+SQLConnectionState.errorSavingCatalog=Error saving current catalog.\nThis might happen when reconnecting a Session to restore a broken connection.\nThe new connection will use the default catalog.
+SQLConnectionState.errorSavingAutoCommit=Error saving autocommit state.\nThis might happen when reconnecting a Session to restore a broken connection.\nThe new connection will use the autocommit state.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <wi...@us...> - 2011-06-01 18:36:45
|
Revision: 6281
http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=6281&view=rev
Author: wis775
Date: 2011-06-01 18:36:38 +0000 (Wed, 01 Jun 2011)
Log Message:
-----------
Source Tabs: Syntax highlighting is used for displaying the source of database objects, if the syntax plugin is installed.
Modified Paths:
--------------
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/objecttree/tabs/BaseSourcePanel.java
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/objecttree/tabs/BaseSourceTab.java
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/objecttree/tabs/FormattedSourceTab.java
trunk/sql12/app/src/test/java/net/sourceforge/squirrel_sql/client/session/mainpanel/objecttree/tabs/AbstractSourceTabTest.java
trunk/sql12/app/src/test/java/net/sourceforge/squirrel_sql/client/session/mainpanel/objecttree/tabs/AbstractTabTest.java
trunk/sql12/doc/src/main/resources/changes.txt
trunk/sql12/plugins/informix/src/main/java/net/sourceforge/squirrel_sql/plugins/informix/tab/InformixSourceTab.java
trunk/sql12/plugins/oracle/src/main/java/net/sourceforge/squirrel_sql/plugins/oracle/tab/ConstraintSourceTab.java
trunk/sql12/plugins/oracle/src/main/java/net/sourceforge/squirrel_sql/plugins/oracle/tab/IndexSourceTab.java
trunk/sql12/plugins/oracle/src/main/java/net/sourceforge/squirrel_sql/plugins/oracle/tab/OracleSourceTab.java
trunk/sql12/plugins/postgres/src/main/java/net/sourceforge/squirrel_sql/plugins/postgres/tab/PostgresSourceTab.java
Modified: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/objecttree/tabs/BaseSourcePanel.java
===================================================================
--- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/objecttree/tabs/BaseSourcePanel.java 2011-06-01 18:03:44 UTC (rev 6280)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/objecttree/tabs/BaseSourcePanel.java 2011-06-01 18:36:38 UTC (rev 6281)
@@ -1,17 +1,82 @@
package net.sourceforge.squirrel_sql.client.session.mainpanel.objecttree.tabs;
+import java.awt.BorderLayout;
import java.awt.LayoutManager;
import java.sql.PreparedStatement;
+import java.util.HashMap;
import javax.swing.JPanel;
+import javax.swing.JTextArea;
+import javax.swing.text.JTextComponent;
+import net.sourceforge.squirrel_sql.client.session.ISQLEntryPanel;
+import net.sourceforge.squirrel_sql.client.session.ISQLEntryPanelFactory;
import net.sourceforge.squirrel_sql.client.session.ISession;
+import net.sourceforge.squirrel_sql.client.session.SQLEntryPanelUtil;
+import net.sourceforge.squirrel_sql.client.session.parser.IParserEventsProcessorFactory;
abstract public class BaseSourcePanel extends JPanel {
- public BaseSourcePanel(LayoutManager manager) {
- super(manager);
+ private JTextComponent textArea;
+ private ISession session;
+
+ public BaseSourcePanel(ISession session) {
+ super(new BorderLayout());
+ setSession(session);
+ createUserInterface();
}
+ /**
+ * Create the user interface.
+ * The created {@link JTextComponent} depends on the {@link ISQLEntryPanelFactory}.
+ * This enables support for Syntax-Highlighting, if the syntax plugin is loaded.
+ */
+ protected void createUserInterface()
+ {
+
+ HashMap<String, Object> props = new HashMap<String, Object>();
+ props.put(IParserEventsProcessorFactory.class.getName(), null);
+
+ ISQLEntryPanel sqlPanel = getSession().getApplication().getSQLEntryPanelFactory().createSQLEntryPanel(getSession(), props );
+ JTextComponent textComponent = sqlPanel.getTextComponent();
+ textComponent.setEditable(false);
+ setTextArea(textComponent);
+ add(getTextArea(), BorderLayout.CENTER);
+ }
+
public abstract void load(ISession session, PreparedStatement stmt);
+
+ /**
+ * @return the textArea
+ */
+ public JTextComponent getTextArea() {
+ return textArea;
+ }
+
+ /**
+ * @param textArea the textArea to set
+ */
+ private void setTextArea(JTextComponent textArea) {
+ if(textArea == null){
+ throw new IllegalArgumentException("textArea == null");
+ }
+ this.textArea = textArea;
+ }
+
+ /**
+ * @return the session
+ */
+ public ISession getSession() {
+ return session;
+ }
+
+ /**
+ * @param session the session to set
+ */
+ private void setSession(ISession session) {
+ if(session == null){
+ throw new IllegalArgumentException("session == null");
+ }
+ this.session = session;
+ }
}
Modified: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/objecttree/tabs/BaseSourceTab.java
===================================================================
--- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/objecttree/tabs/BaseSourceTab.java 2011-06-01 18:03:44 UTC (rev 6280)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/objecttree/tabs/BaseSourceTab.java 2011-06-01 18:36:38 UTC (rev 6281)
@@ -18,14 +18,12 @@
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-import java.awt.BorderLayout;
import java.awt.Component;
import java.sql.PreparedStatement;
import java.sql.ResultSet;
import java.sql.SQLException;
import javax.swing.JScrollPane;
-import javax.swing.JTextArea;
import net.sourceforge.squirrel_sql.client.session.ISession;
import net.sourceforge.squirrel_sql.fw.sql.SQLUtilities;
@@ -98,11 +96,13 @@
public Component getComponent()
{
+
+
if (_scroller == null)
{
if (_comp == null)
{
- _comp = new DefaultSourcePanel();
+ _comp = createSourcePanel();
}
_scroller = new JScrollPane(_comp);
LineNumber lineNumber = new LineNumber(_comp);
@@ -117,6 +117,7 @@
* subclass of BaseSourcePanel.
*
* @param panel
+ * @deprecated Use {@link #createSourcePanel()} as callback method.
*/
public void setSourcePanel(BaseSourcePanel panel)
{
@@ -130,6 +131,11 @@
{
throw new IllegalStateException("Null ISession");
}
+
+ if(_comp == null){
+ _comp = createSourcePanel();
+ }
+
try
{
PreparedStatement pstmt = createStatement();
@@ -148,6 +154,21 @@
}
/**
+ * Create a instance of {@link BaseSourcePanel}.
+ * Per default, a {@link DefaultSourcePanel} is used.
+ * Subclasses can use this to override the default behavior provided by the DefaultSourcePanel, with a
+ * subclass of BaseSourcePanel.
+ * @return The source panel to use.
+ */
+ protected BaseSourcePanel createSourcePanel() {
+ /*
+ * This callback method replaces the previous use of setSourcePanel, because since we use syntax highlightning, we need a session.
+ * So we need a callback for "lazy" initialization of the source pane.
+ */
+ return new DefaultSourcePanel(getSession());
+ }
+
+ /**
* Sub-classes should override this method to return a PreparedStatement which will yield the source code
* of the object returned by getDatabaseObjectInfo.
*
@@ -161,16 +182,16 @@
{
private static final long serialVersionUID = 1L;
- private JTextArea _ta;
+
- DefaultSourcePanel() {
- super(new BorderLayout());
- createUserInterface();
+ DefaultSourcePanel(ISession session) {
+ super(session);
}
+
public void load(ISession session, PreparedStatement stmt)
{
- _ta.setText("");
+ getTextArea().setText("");
ResultSet rs = null;
try
{
@@ -180,8 +201,8 @@
{
buf.append(rs.getString(1));
}
- _ta.setText(buf.toString());
- _ta.setCaretPosition(0);
+ getTextArea().setText(buf.toString());
+ getTextArea().setCaretPosition(0);
} catch (SQLException ex)
{
session.showErrorMessage(ex);
@@ -192,11 +213,5 @@
}
- private void createUserInterface()
- {
- _ta = new JTextArea();
- _ta.setEditable(false);
- add(_ta, BorderLayout.CENTER);
- }
}
}
Modified: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/objecttree/tabs/FormattedSourceTab.java
===================================================================
--- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/objecttree/tabs/FormattedSourceTab.java 2011-06-01 18:03:44 UTC (rev 6280)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/objecttree/tabs/FormattedSourceTab.java 2011-06-01 18:36:38 UTC (rev 6281)
@@ -18,13 +18,10 @@
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-import java.awt.BorderLayout;
import java.sql.PreparedStatement;
import java.sql.ResultSet;
import java.sql.SQLException;
-import javax.swing.JTextArea;
-
import net.sourceforge.squirrel_sql.client.session.ISession;
import net.sourceforge.squirrel_sql.fw.codereformat.CodeReformator;
import net.sourceforge.squirrel_sql.fw.codereformat.CommentSpec;
@@ -79,7 +76,6 @@
public FormattedSourceTab(String hint)
{
super(hint);
- super.setSourcePanel(new FormattedSourcePanel());
}
/**
@@ -142,23 +138,14 @@
{
private static final long serialVersionUID = 1L;
- private JTextArea _ta;
-
- FormattedSourcePanel()
- {
- super(new BorderLayout());
- _ta = new JTextArea();
- _ta.setEditable(false);
- add(_ta, BorderLayout.CENTER);
+ FormattedSourcePanel(ISession session){
+ super(session);
}
public void load(ISession session, PreparedStatement stmt)
{
- _ta.setText("");
+ getTextArea().setText("");
- // always wrap on word boundaries
- _ta.setWrapStyleWord(true);
-
ResultSet rs = null;
try
{
@@ -193,7 +180,7 @@
{
s_log.debug("Object source code before formatting: " + processedResult);
}
- _ta.setText(format(processedResult));
+ getTextArea().setText(format(processedResult));
}
else
{
@@ -201,11 +188,9 @@
{
buf.append(i18n.NO_SOURCE_AVAILABLE);
}
- _ta.setText(processedResult);
+ getTextArea().setText(processedResult);
}
- _ta.setCaretPosition(0);
- _ta.setTabSize(4);
-
+ getTextArea().setCaretPosition(0);
}
catch (Exception ex)
{
@@ -316,4 +301,12 @@
final IDatabaseObjectInfo doi = getDatabaseObjectInfo();
return new String[] { doi.getSchemaName(), doi.getSimpleName() };
}
-}
+
+ /**
+ * @see net.sourceforge.squirrel_sql.client.session.mainpanel.objecttree.tabs.BaseSourceTab#createSourcePanel()
+ */
+ @Override
+ protected BaseSourcePanel createSourcePanel() {
+ return new FormattedSourcePanel(getSession());
+ }
+}
\ No newline at end of file
Modified: trunk/sql12/app/src/test/java/net/sourceforge/squirrel_sql/client/session/mainpanel/objecttree/tabs/AbstractSourceTabTest.java
===================================================================
--- trunk/sql12/app/src/test/java/net/sourceforge/squirrel_sql/client/session/mainpanel/objecttree/tabs/AbstractSourceTabTest.java 2011-06-01 18:03:44 UTC (rev 6280)
+++ trunk/sql12/app/src/test/java/net/sourceforge/squirrel_sql/client/session/mainpanel/objecttree/tabs/AbstractSourceTabTest.java 2011-06-01 18:36:38 UTC (rev 6281)
@@ -24,7 +24,12 @@
import java.sql.PreparedStatement;
import java.sql.ResultSet;
+import java.util.HashMap;
+import javax.swing.JTextArea;
+
+import net.sourceforge.squirrel_sql.client.session.parser.IParserEventsProcessor;
+import net.sourceforge.squirrel_sql.client.session.parser.IParserEventsProcessorFactory;
import net.sourceforge.squirrel_sql.fw.sql.IDatabaseObjectInfo;
import net.sourceforge.squirrel_sql.fw.sql.ISQLDatabaseMetaData;
@@ -75,7 +80,13 @@
expect(mockApplication.getSessionManager()).andStubReturn(mockSessionManager);
expect(mockSessionManager.getSession(mockSessionId)).andStubReturn(mockSession);
+ expect(mockApplication.getSQLEntryPanelFactory()).andReturn(mockSQLPanelFactory);
+ HashMap<String, Object> props = new HashMap<String, Object>();
+ props.put(IParserEventsProcessorFactory.class.getName(), null);
+ expect(mockSQLPanelFactory.createSQLEntryPanel(mockSession, props)).andStubReturn(mockSQLEntryPanel);
+ expect(mockSQLEntryPanel.getTextComponent()).andStubReturn(new JTextArea());
+
expect(mockSQLConnection.prepareStatement(isA(String.class))).andStubReturn(mockPreparedStatement);
mockPreparedStatement.setString(EasyMock.anyInt(), isA(String.class));
expectLastCall().anyTimes();
@@ -85,8 +96,8 @@
mockPreparedStatement.close();
mockHelper.replayAll();
+ classUnderTest.setSession(mockSession);
classUnderTest.getComponent();
- classUnderTest.setSession(mockSession);
classUnderTest.setDatabaseObjectInfo(mockDatabaseObjectInfo);
classUnderTest.select();
mockHelper.verifyAll();
Modified: trunk/sql12/app/src/test/java/net/sourceforge/squirrel_sql/client/session/mainpanel/objecttree/tabs/AbstractTabTest.java
===================================================================
--- trunk/sql12/app/src/test/java/net/sourceforge/squirrel_sql/client/session/mainpanel/objecttree/tabs/AbstractTabTest.java 2011-06-01 18:03:44 UTC (rev 6280)
+++ trunk/sql12/app/src/test/java/net/sourceforge/squirrel_sql/client/session/mainpanel/objecttree/tabs/AbstractTabTest.java 2011-06-01 18:36:38 UTC (rev 6281)
@@ -22,6 +22,8 @@
import net.sourceforge.squirrel_sql.BaseSQuirreLJUnit4TestCase;
import net.sourceforge.squirrel_sql.client.IApplication;
+import net.sourceforge.squirrel_sql.client.session.ISQLEntryPanel;
+import net.sourceforge.squirrel_sql.client.session.ISQLEntryPanelFactory;
import net.sourceforge.squirrel_sql.client.session.ISession;
import net.sourceforge.squirrel_sql.client.session.SessionManager;
import net.sourceforge.squirrel_sql.fw.id.IIdentifier;
@@ -42,6 +44,10 @@
protected ISQLConnection mockSQLConnection = mockHelper.createMock("mockSQLConnection", ISQLConnection.class);
protected IApplication mockApplication = mockHelper.createMock("mockApplication", IApplication.class);
+
+ protected ISQLEntryPanelFactory mockSQLPanelFactory = mockHelper.createMock("mockSQLPanelFactory", ISQLEntryPanelFactory.class);
+
+ protected ISQLEntryPanel mockSQLEntryPanel = mockHelper.createMock("mockSQLEntryPanel", ISQLEntryPanel.class);
protected IIdentifier mockSessionId = mockHelper.createMock(IIdentifier.class);
Modified: trunk/sql12/doc/src/main/resources/changes.txt
===================================================================
--- trunk/sql12/doc/src/main/resources/changes.txt 2011-06-01 18:03:44 UTC (rev 6280)
+++ trunk/sql12/doc/src/main/resources/changes.txt 2011-06-01 18:36:38 UTC (rev 6281)
@@ -7,6 +7,9 @@
Enhancements:
+Source Tabs:
+ Syntax highlighting is used for displaying the source of database objects, if the syntax plugin is installed.
+
Query Builder / New features in Graph plugin:
The Query Builder is part of the Graph plugin. That means besides the former default and Zoom/Print modes
Query Builder is a new mode of the Graph Plugin. Any existing Graph can be switched to the new mode.
Modified: trunk/sql12/plugins/informix/src/main/java/net/sourceforge/squirrel_sql/plugins/informix/tab/InformixSourceTab.java
===================================================================
--- trunk/sql12/plugins/informix/src/main/java/net/sourceforge/squirrel_sql/plugins/informix/tab/InformixSourceTab.java 2011-06-01 18:03:44 UTC (rev 6280)
+++ trunk/sql12/plugins/informix/src/main/java/net/sourceforge/squirrel_sql/plugins/informix/tab/InformixSourceTab.java 2011-06-01 18:36:38 UTC (rev 6281)
@@ -18,13 +18,10 @@
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-import java.awt.BorderLayout;
import java.sql.PreparedStatement;
import java.sql.ResultSet;
import java.sql.SQLException;
-import javax.swing.JTextArea;
-
import net.sourceforge.squirrel_sql.client.session.ISession;
import net.sourceforge.squirrel_sql.client.session.mainpanel.objecttree.tabs.BaseSourcePanel;
import net.sourceforge.squirrel_sql.client.session.mainpanel.objecttree.tabs.BaseSourceTab;
@@ -65,25 +62,19 @@
public InformixSourceTab(String hint) {
super(hint);
- super.setSourcePanel(new InformixSourcePanel());
}
private final class InformixSourcePanel extends BaseSourcePanel
{
private static final long serialVersionUID = 1L;
- private JTextArea _ta;
-
- InformixSourcePanel() {
- super(new BorderLayout());
- createUserInterface();
+ InformixSourcePanel(ISession session) {
+ super(session);
}
public void load(ISession session, PreparedStatement stmt)
{
- _ta.setText("");
- _ta.setWrapStyleWord(true);
-
+ getTextArea().setText("");
ResultSet rs = null;
try
{
@@ -128,22 +119,22 @@
{
s_log.debug("View source before formatting: " + trimmedSource);
}
- _ta.setText(formatter.reformat(trimmedSource));
+ getTextArea().setText(formatter.reformat(trimmedSource));
} else if (sourceType == TRIGGER_TYPE)
{
if (s_log.isDebugEnabled())
{
s_log.debug("Trigger source before formatting: " + trimmedSource);
}
- _ta.setText(formatter.reformat(trimmedSource));
+ getTextArea().setText(formatter.reformat(trimmedSource));
} else
{
// Skip formatting for Stored Procedures - They can have
// comments embedded in them, and I'm presently not sure
// how the formatter handles this.
- _ta.setText(trimmedSource);
+ getTextArea().setText(trimmedSource);
}
- _ta.setCaretPosition(0);
+ getTextArea().setCaretPosition(0);
} catch (SQLException ex)
{
session.showErrorMessage(ex);
@@ -153,13 +144,13 @@
}
}
-
- private void createUserInterface()
- {
- _ta = new JTextArea();
- _ta.setEditable(false);
- add(_ta, BorderLayout.CENTER);
- }
}
+ /**
+ * @see net.sourceforge.squirrel_sql.client.session.mainpanel.objecttree.tabs.BaseSourceTab#createSourcePanel()
+ */
+ @Override
+ protected BaseSourcePanel createSourcePanel() {
+ return new InformixSourcePanel(getSession());
+ }
}
Modified: trunk/sql12/plugins/oracle/src/main/java/net/sourceforge/squirrel_sql/plugins/oracle/tab/ConstraintSourceTab.java
===================================================================
--- trunk/sql12/plugins/oracle/src/main/java/net/sourceforge/squirrel_sql/plugins/oracle/tab/ConstraintSourceTab.java 2011-06-01 18:03:44 UTC (rev 6280)
+++ trunk/sql12/plugins/oracle/src/main/java/net/sourceforge/squirrel_sql/plugins/oracle/tab/ConstraintSourceTab.java 2011-06-01 18:36:38 UTC (rev 6281)
@@ -17,13 +17,10 @@
*/
package net.sourceforge.squirrel_sql.plugins.oracle.tab;
-import java.awt.BorderLayout;
import java.sql.PreparedStatement;
import java.sql.ResultSet;
import java.sql.SQLException;
-import javax.swing.JTextArea;
-
import net.sourceforge.squirrel_sql.client.session.ISession;
import net.sourceforge.squirrel_sql.client.session.mainpanel.objecttree.tabs.BaseSourcePanel;
import net.sourceforge.squirrel_sql.client.session.mainpanel.objecttree.tabs.BaseSourceTab;
@@ -65,7 +62,7 @@
public ConstraintSourceTab() {
// i18n[oracle.showConstraintSource=Show constraint source]
super(s_stringMgr.getString("oracle.showConstraintSource"));
- super.setSourcePanel(new ConstraintSourcePanel());
+
}
@Override
@@ -86,18 +83,12 @@
private final class ConstraintSourcePanel extends BaseSourcePanel {
private static final long serialVersionUID = 1L;
- private JTextArea textArea;
- ConstraintSourcePanel() {
- super(new BorderLayout());
- textArea = new JTextArea();
- textArea.setEditable(false);
- add(textArea, BorderLayout.CENTER);
+ ConstraintSourcePanel(ISession session) {
+ super(session);
}
public void load(ISession session, PreparedStatement stmt) {
- // always wrap on word boundaries
- textArea.setWrapStyleWord(true);
ConstraintSourceBuilder csb = new ConstraintSourceBuilder(session);
ResultSet rs = null;
@@ -120,9 +111,9 @@
csb.buildConstraintSource(ci);
if (csb.getConstraintSource() != null) {
- textArea.setText(csb.getConstraintSource());
+ getTextArea().setText(csb.getConstraintSource());
} else {
- textArea.setText("Source NOT available");
+ getTextArea().setText("Source NOT available");
}
}
} catch (Exception ex) {
@@ -136,4 +127,12 @@
}
}
}
+
+ /**
+ * @see net.sourceforge.squirrel_sql.client.session.mainpanel.objecttree.tabs.BaseSourceTab#createSourcePanel()
+ */
+ @Override
+ protected BaseSourcePanel createSourcePanel() {
+ return new ConstraintSourcePanel(getSession());
+ }
}
Modified: trunk/sql12/plugins/oracle/src/main/java/net/sourceforge/squirrel_sql/plugins/oracle/tab/IndexSourceTab.java
===================================================================
--- trunk/sql12/plugins/oracle/src/main/java/net/sourceforge/squirrel_sql/plugins/oracle/tab/IndexSourceTab.java 2011-06-01 18:03:44 UTC (rev 6280)
+++ trunk/sql12/plugins/oracle/src/main/java/net/sourceforge/squirrel_sql/plugins/oracle/tab/IndexSourceTab.java 2011-06-01 18:36:38 UTC (rev 6281)
@@ -18,13 +18,8 @@
*/
package net.sourceforge.squirrel_sql.plugins.oracle.tab;
-import java.sql.PreparedStatement;
-import java.sql.SQLException;
-
-import net.sourceforge.squirrel_sql.client.session.ISession;
-import net.sourceforge.squirrel_sql.client.session.mainpanel.objecttree.tabs.BaseSourceTab;
+import net.sourceforge.squirrel_sql.client.session.mainpanel.objecttree.tabs.FormattedSourceTab;
import net.sourceforge.squirrel_sql.fw.sql.IDatabaseObjectInfo;
-import net.sourceforge.squirrel_sql.fw.sql.ISQLConnection;
import net.sourceforge.squirrel_sql.fw.util.StringManager;
import net.sourceforge.squirrel_sql.fw.util.StringManagerFactory;
@@ -34,7 +29,7 @@
* @author Stefan Willinger
*
*/
-public class IndexSourceTab extends BaseSourceTab {
+public class IndexSourceTab extends FormattedSourceTab {
private static final StringManager s_stringMgr =
StringManagerFactory.getStringManager(IndexSourceTab.class);
@@ -49,15 +44,22 @@
super(s_stringMgr.getString("oracle.showIndexSource"));
}
- protected PreparedStatement createStatement() throws SQLException
- {
- final ISession session = getSession();
- final IDatabaseObjectInfo doi = getDatabaseObjectInfo();
+ /**
+ * @see net.sourceforge.squirrel_sql.client.session.mainpanel.objecttree.tabs.FormattedSourceTab#getSqlStatement()
+ */
+ @Override
+ protected String getSqlStatement() {
+ return SQL;
+ }
- ISQLConnection conn = session.getSQLConnection();
- PreparedStatement pstmt = conn.prepareStatement(SQL);
- pstmt.setString(1, doi.getSimpleName());
- pstmt.setString(2, doi.getSchemaName());
- return pstmt;
+ /**
+ * @see net.sourceforge.squirrel_sql.client.session.mainpanel.objecttree.tabs.FormattedSourceTab#getBindValues()
+ */
+ @Override
+ protected String[] getBindValues() {
+ IDatabaseObjectInfo doi = getDatabaseObjectInfo();
+ return new String[]{doi.getSimpleName(), doi.getSchemaName()};
}
+
+
}
Modified: trunk/sql12/plugins/oracle/src/main/java/net/sourceforge/squirrel_sql/plugins/oracle/tab/OracleSourceTab.java
===================================================================
--- trunk/sql12/plugins/oracle/src/main/java/net/sourceforge/squirrel_sql/plugins/oracle/tab/OracleSourceTab.java 2011-06-01 18:03:44 UTC (rev 6280)
+++ trunk/sql12/plugins/oracle/src/main/java/net/sourceforge/squirrel_sql/plugins/oracle/tab/OracleSourceTab.java 2011-06-01 18:36:38 UTC (rev 6281)
@@ -17,15 +17,12 @@
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-import java.awt.BorderLayout;
import java.sql.PreparedStatement;
import java.sql.ResultSet;
import java.sql.SQLException;
import java.util.Arrays;
import java.util.List;
-import javax.swing.JTextArea;
-
import net.sourceforge.squirrel_sql.client.session.ISession;
import net.sourceforge.squirrel_sql.client.session.mainpanel.objecttree.tabs.BaseSourcePanel;
import net.sourceforge.squirrel_sql.client.session.mainpanel.objecttree.tabs.BaseSourceTab;
@@ -72,25 +69,18 @@
public OracleSourceTab(String hint)
{
super(hint);
- super.setSourcePanel(new OracleSourcePanel());
}
private final class OracleSourcePanel extends BaseSourcePanel
{
private static final long serialVersionUID = 7855991042669454322L;
- private JTextArea _ta;
-
- OracleSourcePanel()
- {
- super(new BorderLayout());
- createUserInterface();
+ OracleSourcePanel(ISession session){
+ super(session);
}
public void load(ISession session, PreparedStatement stmt)
{
- _ta.setText("");
- _ta.setWrapStyleWord(true);
ResultSet rs = null;
try
{
@@ -133,8 +123,8 @@
}
source = formatter.reformat(buf.toString());
}
- _ta.setText(source);
- _ta.setCaretPosition(0);
+ getTextArea().setText(source);
+ getTextArea().setCaretPosition(0);
}
catch (SQLException ex)
{
@@ -146,12 +136,14 @@
}
- private void createUserInterface()
- {
- _ta = new JTextArea();
- _ta.setEditable(false);
- add(_ta, BorderLayout.CENTER);
- }
+
}
-
+
+ /**
+ * @see net.sourceforge.squirrel_sql.client.session.mainpanel.objecttree.tabs.BaseSourceTab#createSourcePanel()
+ */
+ @Override
+ protected BaseSourcePanel createSourcePanel() {
+ return new OracleSourcePanel(getSession());
+ }
}
Modified: trunk/sql12/plugins/postgres/src/main/java/net/sourceforge/squirrel_sql/plugins/postgres/tab/PostgresSourceTab.java
===================================================================
--- trunk/sql12/plugins/postgres/src/main/java/net/sourceforge/squirrel_sql/plugins/postgres/tab/PostgresSourceTab.java 2011-06-01 18:03:44 UTC (rev 6280)
+++ trunk/sql12/plugins/postgres/src/main/java/net/sourceforge/squirrel_sql/plugins/postgres/tab/PostgresSourceTab.java 2011-06-01 18:36:38 UTC (rev 6281)
@@ -18,7 +18,6 @@
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-import java.awt.BorderLayout;
import java.sql.PreparedStatement;
import java.sql.ResultSet;
import java.sql.SQLException;
@@ -60,24 +59,19 @@
public PostgresSourceTab(String hint) {
super(hint);
- super.setSourcePanel(new PostgresSourcePanel());
}
private final class PostgresSourcePanel extends BaseSourcePanel
{
private static final long serialVersionUID = 1L;
- private JTextArea _ta;
-
- PostgresSourcePanel() {
- super(new BorderLayout());
- createUserInterface();
+ PostgresSourcePanel(ISession session) {
+ super(session);
}
public void load(ISession session, PreparedStatement stmt)
{
- _ta.setText("");
- _ta.setWrapStyleWord(true);
+ getTextArea().setText("");
ResultSet rs = null;
try
{
@@ -109,12 +103,12 @@
{
s_log.debug("View source before formatting: " + buf.toString());
}
- _ta.setText(formatter.reformat(buf.toString()));
+ getTextArea().setText(formatter.reformat(buf.toString()));
} else
{
- _ta.setText(buf.toString());
+ getTextArea().setText(buf.toString());
}
- _ta.setCaretPosition(0);
+ getTextArea().setCaretPosition(0);
} catch (SQLException ex)
{
session.showErrorMessage(ex);
@@ -125,12 +119,12 @@
}
- private void createUserInterface()
- {
- _ta = new JTextArea();
- _ta.setEditable(false);
- add(_ta, BorderLayout.CENTER);
- }
}
-
+ /**
+ * @see net.sourceforge.squirrel_sql.client.session.mainpanel.objecttree.tabs.BaseSourceTab#createSourcePanel()
+ */
+ @Override
+ protected BaseSourcePanel createSourcePanel() {
+ return new PostgresSourcePanel(getSession());
+ }
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <wi...@us...> - 2011-06-04 11:37:08
|
Revision: 6289
http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=6289&view=rev
Author: wis775
Date: 2011-06-04 11:37:02 +0000 (Sat, 04 Jun 2011)
Log Message:
-----------
Display the table related indexes in the object tree under the table node.
This is additional to the generally index node, which displays all indexes of the schema.
Modified Paths:
--------------
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/objecttree/expanders/IndexParentExpander.java
trunk/sql12/doc/src/main/resources/changes.txt
trunk/sql12/plugins/oracle/src/main/java/net/sourceforge/squirrel_sql/plugins/oracle/expander/TableExpander.java
Added Paths:
-----------
trunk/sql12/plugins/oracle/src/main/java/net/sourceforge/squirrel_sql/plugins/oracle/expander/OracleTableIndexExtractor.java
trunk/sql12/plugins/oracle/src/test/java/net/sourceforge/squirrel_sql/plugins/oracle/tab/IndexSourceTabTest.java
Modified: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/objecttree/expanders/IndexParentExpander.java
===================================================================
--- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/objecttree/expanders/IndexParentExpander.java 2011-06-04 11:20:13 UTC (rev 6288)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/objecttree/expanders/IndexParentExpander.java 2011-06-04 11:37:02 UTC (rev 6289)
@@ -27,13 +27,12 @@
import net.sourceforge.squirrel_sql.client.session.ISession;
import net.sourceforge.squirrel_sql.client.session.mainpanel.objecttree.INodeExpander;
import net.sourceforge.squirrel_sql.client.session.mainpanel.objecttree.ObjectTreeNode;
+import net.sourceforge.squirrel_sql.fw.sql.DatabaseObjectInfo;
+import net.sourceforge.squirrel_sql.fw.sql.DatabaseObjectType;
import net.sourceforge.squirrel_sql.fw.sql.IDatabaseObjectInfo;
import net.sourceforge.squirrel_sql.fw.sql.ISQLConnection;
-import net.sourceforge.squirrel_sql.fw.sql.IndexInfo;
import net.sourceforge.squirrel_sql.fw.sql.SQLDatabaseMetaData;
import net.sourceforge.squirrel_sql.fw.sql.SQLUtilities;
-import net.sourceforge.squirrel_sql.fw.sql.IndexInfo.IndexType;
-import net.sourceforge.squirrel_sql.fw.sql.IndexInfo.SortOrder;
import net.sourceforge.squirrel_sql.fw.util.log.ILogger;
import net.sourceforge.squirrel_sql.fw.util.log.LoggerController;
@@ -107,22 +106,7 @@
String indexName = rs.getString(1);
String cat = parentDbinfo.getCatalogName();
String schema = parentDbinfo.getSchemaName();
- String tableName = tableInfo.getSimpleName();
- // This info is merely a placeholder in the tree that we can use to get index name and
- // parent name more easily. We probably should create a IndexColumnInfo that has this
- // extra info in it.
- String columnName = null;
- boolean nonUnique = true;
- String indexQualifier = null;
- IndexType indexType = null;
- short ordinalPosition = 0;
- SortOrder sortOrder = null;
- int cardinality = 0;
- int pages = 0;
- String filterCondition = null;
- IndexInfo doi = new IndexInfo(
- cat, schema, indexName, tableName, columnName, nonUnique, indexQualifier, indexType,
- ordinalPosition, sortOrder, cardinality, pages, filterCondition, md);
+ DatabaseObjectInfo doi = new DatabaseObjectInfo(cat, schema, indexName, DatabaseObjectType.INDEX, md);
childNodes.add(new ObjectTreeNode(session, doi));
}
} catch (SQLException e)
Modified: trunk/sql12/doc/src/main/resources/changes.txt
===================================================================
--- trunk/sql12/doc/src/main/resources/changes.txt 2011-06-04 11:20:13 UTC (rev 6288)
+++ trunk/sql12/doc/src/main/resources/changes.txt 2011-06-04 11:37:02 UTC (rev 6289)
@@ -25,7 +25,9 @@
Feature Request 3307812: Select an entire row via the table's pop-up menu.
Oracle Plugin:
- The DDL of a index could be displayed under the source tab.
+ - The DDL of a index could be displayed under the source tab.
+ - Display the table related indexes in the object tree under the table node. This is additional to the
+ generally index node, which displays all indexes of the schema.
New plugin "WIKI table configurations":
This plugin provides some pre-defined configurations for various WIKI engines. With this configurations, Squirrel knows, how to transform the selection
Added: trunk/sql12/plugins/oracle/src/main/java/net/sourceforge/squirrel_sql/plugins/oracle/expander/OracleTableIndexExtractor.java
===================================================================
--- trunk/sql12/plugins/oracle/src/main/java/net/sourceforge/squirrel_sql/plugins/oracle/expander/OracleTableIndexExtractor.java (rev 0)
+++ trunk/sql12/plugins/oracle/src/main/java/net/sourceforge/squirrel_sql/plugins/oracle/expander/OracleTableIndexExtractor.java 2011-06-04 11:37:02 UTC (rev 6289)
@@ -0,0 +1,53 @@
+/*
+ * Copyright (C) 2011 Stefan Willinger
+ * wi...@us...
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+package net.sourceforge.squirrel_sql.plugins.oracle.expander;
+
+import java.sql.PreparedStatement;
+import java.sql.SQLException;
+
+import net.sourceforge.squirrel_sql.client.session.mainpanel.objecttree.expanders.ITableIndexExtractor;
+import net.sourceforge.squirrel_sql.fw.sql.IDatabaseObjectInfo;
+
+/**
+ * A {@link ITableIndexExtractor} for indexes, related to a specific table in a oracle database.
+ * @author Stefan Willinger
+ *
+ */
+public class OracleTableIndexExtractor implements ITableIndexExtractor {
+ private static String SQL = "select index_name from sys.all_indexes where table_owner = ? and table_name = ? order by index_name";
+
+ /**
+ * @see net.sourceforge.squirrel_sql.client.session.mainpanel.objecttree.expanders.ITableIndexExtractor#getTableIndexQuery()
+ */
+ @Override
+ public String getTableIndexQuery() {
+ return SQL;
+ }
+
+ /**
+ * @see net.sourceforge.squirrel_sql.client.session.mainpanel.objecttree.expanders.ITableIndexExtractor#bindParamters(java.sql.PreparedStatement,
+ * net.sourceforge.squirrel_sql.fw.sql.IDatabaseObjectInfo)
+ */
+ @Override
+ public void bindParamters(PreparedStatement pstmt, IDatabaseObjectInfo dbo) throws SQLException {
+ pstmt.setString(1, dbo.getSchemaName());
+ pstmt.setString(2, dbo.getSimpleName());
+ }
+
+}
Property changes on: trunk/sql12/plugins/oracle/src/main/java/net/sourceforge/squirrel_sql/plugins/oracle/expander/OracleTableIndexExtractor.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Modified: trunk/sql12/plugins/oracle/src/main/java/net/sourceforge/squirrel_sql/plugins/oracle/expander/TableExpander.java
===================================================================
--- trunk/sql12/plugins/oracle/src/main/java/net/sourceforge/squirrel_sql/plugins/oracle/expander/TableExpander.java 2011-06-04 11:20:13 UTC (rev 6288)
+++ trunk/sql12/plugins/oracle/src/main/java/net/sourceforge/squirrel_sql/plugins/oracle/expander/TableExpander.java 2011-06-04 11:37:02 UTC (rev 6289)
@@ -17,12 +17,15 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
+import java.sql.SQLException;
import java.util.ArrayList;
import java.util.List;
import net.sourceforge.squirrel_sql.client.session.ISession;
import net.sourceforge.squirrel_sql.client.session.mainpanel.objecttree.INodeExpander;
import net.sourceforge.squirrel_sql.client.session.mainpanel.objecttree.ObjectTreeNode;
+import net.sourceforge.squirrel_sql.client.session.mainpanel.objecttree.expanders.IndexParentExpander;
+import net.sourceforge.squirrel_sql.client.session.mainpanel.objecttree.expanders.IndexParentInfo;
import net.sourceforge.squirrel_sql.fw.sql.IDatabaseObjectInfo;
import net.sourceforge.squirrel_sql.fw.sql.IObjectTypes;
import net.sourceforge.squirrel_sql.fw.sql.SQLDatabaseMetaData;
@@ -58,7 +61,7 @@
* @return A list of <TT>ObjectTreeNode</TT> objects representing the child
* nodes for the passed node.
*/
- public List<ObjectTreeNode> createChildren(ISession session, ObjectTreeNode parentNode)
+ public List<ObjectTreeNode> createChildren(ISession session, ObjectTreeNode parentNode) throws SQLException
{
final List<ObjectTreeNode> childNodes = new ArrayList<ObjectTreeNode>();
final IDatabaseObjectInfo parentDbinfo = parentNode.getDatabaseObjectInfo();
@@ -67,16 +70,34 @@
IDatabaseObjectInfo dbinfo = new TriggerParentInfo(parentDbinfo,
schemaName, md, _objectTypes);
+ addNode(session, childNodes, dbinfo);
- ObjectTreeNode child = new ObjectTreeNode(session, dbinfo);
- childNodes.add(child);
-
IDatabaseObjectInfo cstrinfo = new ConstraintParentInfo(parentDbinfo,
schemaName, md, _objectTypes);
+ addNode(session, childNodes, cstrinfo);
- child = new ObjectTreeNode(session, cstrinfo);
- childNodes.add(child);
+ IDatabaseObjectInfo indexInfo = new IndexParentInfo(parentDbinfo,
+ schemaName, md);
+
+ IndexParentExpander tableIndexExpander = new IndexParentExpander();
+ tableIndexExpander.setTableIndexExtractor(new OracleTableIndexExtractor());
+ addNode(session, childNodes, indexInfo, tableIndexExpander);
+
return childNodes;
}
+
+ /**
+ * Adds a new {@link ObjectTreeNode} to the nodes.
+ * @param session Session to use
+ * @param childNodes Current Child nodes
+ * @param node The new node
+ */
+ private void addNode(ISession session, final List<ObjectTreeNode> childNodes, IDatabaseObjectInfo node, INodeExpander ...expanders) {
+ ObjectTreeNode child = new ObjectTreeNode(session, node);
+ for (INodeExpander expander : expanders) {
+ child.addExpander(expander);
+ }
+ childNodes.add(child);
+ }
}
Added: trunk/sql12/plugins/oracle/src/test/java/net/sourceforge/squirrel_sql/plugins/oracle/tab/IndexSourceTabTest.java
===================================================================
--- trunk/sql12/plugins/oracle/src/test/java/net/sourceforge/squirrel_sql/plugins/oracle/tab/IndexSourceTabTest.java (rev 0)
+++ trunk/sql12/plugins/oracle/src/test/java/net/sourceforge/squirrel_sql/plugins/oracle/tab/IndexSourceTabTest.java 2011-06-04 11:37:02 UTC (rev 6289)
@@ -0,0 +1,37 @@
+/*
+ * Copyright (C) 2011 Stefan Willinger
+ * wi...@us...
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+package net.sourceforge.squirrel_sql.plugins.oracle.tab;
+
+import org.junit.Before;
+
+import net.sourceforge.squirrel_sql.client.session.mainpanel.objecttree.tabs.AbstractSourceTabTest;
+
+/**
+ * Test the index source tab
+ * @author Stefan Willinger
+ *
+ */
+public class IndexSourceTabTest extends AbstractSourceTabTest {
+
+ @Before
+ public void setUp() throws Exception
+ {
+ classUnderTest = new IndexSourceTab();
+ }
+}
Property changes on: trunk/sql12/plugins/oracle/src/test/java/net/sourceforge/squirrel_sql/plugins/oracle/tab/IndexSourceTabTest.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <wi...@us...> - 2011-06-04 15:27:34
|
Revision: 6290
http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=6290&view=rev
Author: wis775
Date: 2011-06-04 15:27:27 +0000 (Sat, 04 Jun 2011)
Log Message:
-----------
When displaying the content of a table, the dialog "Please wait while the query is executed" may not dispose.
This may occurs only for tables of a "In Memory Database" with only a few rows of data. (The query has to be quick enough)
Modified Paths:
--------------
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/objecttree/tabs/table/ContentsTab.java
trunk/sql12/doc/src/main/resources/changes.txt
Modified: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/objecttree/tabs/table/ContentsTab.java
===================================================================
--- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/objecttree/tabs/table/ContentsTab.java 2011-06-04 11:37:02 UTC (rev 6289)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/objecttree/tabs/table/ContentsTab.java 2011-06-04 15:27:27 UTC (rev 6290)
@@ -458,13 +458,13 @@
*/
private void disposeWaitDialog() {
if (!_prefs.getShowPleaseWaitDialog()) return;
- if (_waitDialog != null) {
GUIUtils.processOnSwingEventThread(new Runnable() {
public void run() {
+ if (_waitDialog != null) {
_waitDialog.dispose();
}
+ }
});
- }
}
public void setDatabaseObjectInfo(IDatabaseObjectInfo value)
Modified: trunk/sql12/doc/src/main/resources/changes.txt
===================================================================
--- trunk/sql12/doc/src/main/resources/changes.txt 2011-06-04 11:37:02 UTC (rev 6289)
+++ trunk/sql12/doc/src/main/resources/changes.txt 2011-06-04 15:27:27 UTC (rev 6290)
@@ -74,6 +74,9 @@
Bug-fixes:
+When displaying the content of a table, the dialog "Please wait while the query is executed" may not dispose.
+ This may occurs only for tables of a "In Memory Database" with only a few rows of data.
+
3309565: Not possible to translate SQL connection error messages, because they are hard coded.
3303174: Installer hangs on linux. Updated version of IzPack compiler to 4.3.4.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ger...@us...> - 2011-06-05 17:40:00
|
Revision: 6293
http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=6293&view=rev
Author: gerdwagner
Date: 2011-06-05 17:39:52 +0000 (Sun, 05 Jun 2011)
Log Message:
-----------
Greenplum plugin, Adam Winn's patch ID 3217167
Modified Paths:
--------------
trunk/sql12/doc/src/main/resources/changes.txt
trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/dialects/DialectFactory.java
trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/dialects/DialectFactoryImpl.java
trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/dialects/IDialectFactory.java
Added Paths:
-----------
trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/dialects/GreenplumDialectExt.java
trunk/sql12/plugins/greenplum/
trunk/sql12/plugins/greenplum/src/
trunk/sql12/plugins/greenplum/src/main/
trunk/sql12/plugins/greenplum/src/main/java/
trunk/sql12/plugins/greenplum/src/main/java/net/
trunk/sql12/plugins/greenplum/src/main/java/net/sourceforge/
trunk/sql12/plugins/greenplum/src/main/java/net/sourceforge/squirrel_sql/
trunk/sql12/plugins/greenplum/src/main/java/net/sourceforge/squirrel_sql/plugins/
trunk/sql12/plugins/greenplum/src/main/java/net/sourceforge/squirrel_sql/plugins/greenplum/
trunk/sql12/plugins/greenplum/src/main/java/net/sourceforge/squirrel_sql/plugins/greenplum/GreenplumPlugin.java
trunk/sql12/plugins/greenplum/src/main/java/net/sourceforge/squirrel_sql/plugins/greenplum/exp/
trunk/sql12/plugins/greenplum/src/main/java/net/sourceforge/squirrel_sql/plugins/greenplum/exp/GreenplumExtTableInodeExpanderFactory.java
trunk/sql12/plugins/greenplum/src/main/java/net/sourceforge/squirrel_sql/plugins/greenplum/exp/GreenplumExtTableParentExpander.java
trunk/sql12/plugins/greenplum/src/main/java/net/sourceforge/squirrel_sql/plugins/greenplum/tab/
trunk/sql12/plugins/greenplum/src/main/java/net/sourceforge/squirrel_sql/plugins/greenplum/tab/GreenplumExternalTableDetailsTab.java
trunk/sql12/plugins/greenplum/src/main/resources/
trunk/sql12/plugins/greenplum/src/main/resources/doc/
trunk/sql12/plugins/greenplum/src/main/resources/doc/changes.txt
trunk/sql12/plugins/greenplum/src/main/resources/doc/licence.txt
trunk/sql12/plugins/greenplum/src/main/resources/net/
trunk/sql12/plugins/greenplum/src/main/resources/net/sourceforge/
trunk/sql12/plugins/greenplum/src/main/resources/net/sourceforge/squirrel_sql/
trunk/sql12/plugins/greenplum/src/main/resources/net/sourceforge/squirrel_sql/plugins/
trunk/sql12/plugins/greenplum/src/main/resources/net/sourceforge/squirrel_sql/plugins/greenplum/
trunk/sql12/plugins/greenplum/src/main/resources/net/sourceforge/squirrel_sql/plugins/greenplum/I18NStrings.properties
trunk/sql12/plugins/greenplum/src/main/resources/net/sourceforge/squirrel_sql/plugins/greenplum/tab/
trunk/sql12/plugins/greenplum/src/main/resources/net/sourceforge/squirrel_sql/plugins/greenplum/tab/I18NStrings.properties
Modified: trunk/sql12/doc/src/main/resources/changes.txt
===================================================================
--- trunk/sql12/doc/src/main/resources/changes.txt 2011-06-05 13:28:35 UTC (rev 6292)
+++ trunk/sql12/doc/src/main/resources/changes.txt 2011-06-05 17:39:52 UTC (rev 6293)
@@ -7,6 +7,10 @@
Enhancements:
+New Plugin: Greenplum DB Plugin
+ New Plugin for the Greenplum DB. Thanks to Adam Winn for the patch (Patch ID 3217167)
+
+
Feature Request 1744964: Copy text from the SQL editor panel as rich text.
This functionality is available via the pop-up menu and the tools pop-up. To use this, the RSyntax editor (Syntax Plugin) must be activated.
Modified: trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/dialects/DialectFactory.java
===================================================================
--- trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/dialects/DialectFactory.java 2011-06-05 13:28:35 UTC (rev 6292)
+++ trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/dialects/DialectFactory.java 2011-06-05 17:39:52 UTC (rev 6293)
@@ -93,6 +93,8 @@
private static final NetezzaDialextExt netezzaDialect = new NetezzaDialextExt();
+ private static final GreenplumDialectExt greenplumDialect = new GreenplumDialectExt();
+
private static final OracleDialectExt oracle9iDialect = new OracleDialectExt();
private static final PointbaseDialectExt pointbaseDialect = new PointbaseDialectExt();
@@ -150,6 +152,7 @@
dbNameDialectMap.put(mckoiDialect.getDisplayName(), mckoiDialect);
dbNameDialectMap.put(mysqlDialect.getDisplayName(), mysqlDialect);
dbNameDialectMap.put(netezzaDialect.getDisplayName(), netezzaDialect);
+ dbNameDialectMap.put(greenplumDialect.getDisplayName(), greenplumDialect);
dbNameDialectMap.put(oracle9iDialect.getDisplayName(), oracle9iDialect);
dbNameDialectMap.put(pointbaseDialect.getDisplayName(), pointbaseDialect);
dbNameDialectMap.put(postgreSQLDialect.getDisplayName(), postgreSQLDialect);
@@ -250,6 +253,11 @@
return dialectSupportsProduct(md, netezzaDialect);
}
+ public static boolean isGreenplum(ISQLDatabaseMetaData md)
+ {
+ return dialectSupportsProduct(md, greenplumDialect);
+ }
+
public static boolean isOracle(ISQLDatabaseMetaData md)
{
return dialectSupportsProduct(md, oracle9iDialect);
@@ -374,6 +382,7 @@
if (isMySQL5(md)) { return mysql5Dialect; }
if (isMSSQLServer(md)) { return sqlserverDialect; }
if (isNetezza(md)) { return netezzaDialect; }
+ if (isGreenplum(md)) { return greenplumDialect; }
if (isOracle(md)) { return oracle9iDialect; }
if (isPointbase(md)) { return pointbaseDialect; }
if (isPostgreSQL(md)) { return postgreSQLDialect; }
Modified: trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/dialects/DialectFactoryImpl.java
===================================================================
--- trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/dialects/DialectFactoryImpl.java 2011-06-05 13:28:35 UTC (rev 6292)
+++ trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/dialects/DialectFactoryImpl.java 2011-06-05 17:39:52 UTC (rev 6293)
@@ -207,6 +207,15 @@
/**
* @see net.sourceforge.squirrel_sql.fw.dialects.IDialectFactory#
+ * isGreenplum(net.sourceforge.squirrel_sql.fw.sql.ISQLDatabaseMetaData)
+ */
+ public boolean isGreenplum(ISQLDatabaseMetaData md)
+ {
+ return DialectFactory.isGreenplum(md);
+ }
+
+ /**
+ * @see net.sourceforge.squirrel_sql.fw.dialects.IDialectFactory#
* isOracle(net.sourceforge.squirrel_sql.fw.sql.ISQLDatabaseMetaData)
*/
public boolean isOracle(ISQLDatabaseMetaData md)
Added: trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/dialects/GreenplumDialectExt.java
===================================================================
--- trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/dialects/GreenplumDialectExt.java (rev 0)
+++ trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/dialects/GreenplumDialectExt.java 2011-06-05 17:39:52 UTC (rev 6293)
@@ -0,0 +1,767 @@
+/*
+ * Copyright (C) 2011 Adam Winn
+ *
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+
+package net.sourceforge.squirrel_sql.fw.dialects;
+
+import static net.sourceforge.squirrel_sql.fw.dialects.DialectUtils.ADD_COLUMN_TYPE;
+import static net.sourceforge.squirrel_sql.fw.dialects.DialectUtils.COLUMN_DROP_TYPE;
+import static net.sourceforge.squirrel_sql.fw.dialects.DialectUtils.COLUMN_NULL_ALTER_TYPE;
+import static net.sourceforge.squirrel_sql.fw.dialects.DialectUtils.COLUMN_TYPE_ALTER_TYPE;
+import static net.sourceforge.squirrel_sql.fw.dialects.DialectUtils.CREATE_INDEX_TYPE;
+import static net.sourceforge.squirrel_sql.fw.dialects.DialectUtils.DROP_INDEX_TYPE;
+import static net.sourceforge.squirrel_sql.fw.dialects.DialectUtils.getUnsupportedMessage;
+
+import java.sql.Types;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.List;
+
+import net.sourceforge.squirrel_sql.fw.sql.ITableInfo;
+import net.sourceforge.squirrel_sql.fw.sql.TableColumnInfo;
+
+import org.antlr.stringtemplate.StringTemplate;
+import org.hibernate.HibernateException;
+
+/**
+ * Dialect for the Greenplum NPS database server.
+ */
+public class GreenplumDialectExt extends CommonHibernateDialect
+{
+
+ // Note that Greenplum 4.6 doesn't have support for LOB data types. Under the hood, it appears to use
+ // PostgreSQL, but with some limitations.
+ private class GreenplumDialectHelper extends org.hibernate.dialect.PostgreSQLDialect
+ {
+ public GreenplumDialectHelper()
+ {
+ super();
+ registerColumnType(Types.BIGINT, "bigint");
+ registerColumnType(Types.BIT, "bool");
+ registerColumnType(Types.BOOLEAN, "bool");
+ registerColumnType(Types.CHAR, 64000, "char($l)");
+ registerColumnType(Types.CHAR, "char(64000)");
+ // Greenplum 4.6 doesn't support text or any large character object data type
+ // registerColumnType(Types.CLOB, "text");
+ registerColumnType(Types.DATE, "date");
+ registerColumnType(Types.DECIMAL, "decimal($p,2)");
+ registerColumnType(Types.DOUBLE, "double precision");
+ registerColumnType(Types.FLOAT, 15, "float($p)");
+ registerColumnType(Types.FLOAT, "float(15)");
+ registerColumnType(Types.INTEGER, "int");
+ // Greenplum 4.6 doesn't appear to support bytea or any binary type.
+ // registerColumnType(Types.LONGVARBINARY, "bytea");
+ registerColumnType(Types.LONGVARCHAR, "char(64000)");
+ registerColumnType(Types.NUMERIC, "numeric($p,$s)");
+ registerColumnType(Types.REAL, "real");
+ registerColumnType(Types.SMALLINT, "smallint");
+ registerColumnType(Types.TIME, "time");
+ registerColumnType(Types.TIMESTAMP, "timestamp");
+ registerColumnType(Types.TINYINT, "byteint");
+ // Greenplum 4.6 doesn't appear to support bytea or any binary type.
+ // registerColumnType(Types.VARBINARY, "bytea");
+ registerColumnType(Types.VARCHAR, 64000, "varchar($l)");
+ registerColumnType(Types.VARCHAR, "varchar(64000)");
+ }
+ }
+
+ /** extended hibernate dialect used in this wrapper */
+ private GreenplumDialectHelper _dialect = new GreenplumDialectHelper();
+
+ private String cascadeClause;
+
+ @Override
+ public DialectType getDialectType()
+ {
+ return DialectType.NETEZZA;
+ }
+
+ @Override
+ public String getDisplayName()
+ {
+ return "Greenplum";
+ }
+
+ @Override
+ public String getDropSequenceSQL(String sequenceName, boolean cascade, DatabaseObjectQualifier qualifier,
+ SqlGenerationPreferences prefs)
+ {
+ // "DROP SEQUENCE $sequenceName$ $cascade$";
+ StringTemplate st = new StringTemplate(ST_DROP_SEQUENCE_STYLE_ONE);
+
+ HashMap<String, String> valuesMap = DialectUtils.getValuesMap(ST_SEQUENCE_NAME_KEY, sequenceName);
+
+ return DialectUtils.bindTemplateAttributes(this, st, valuesMap, qualifier, prefs);
+ }
+
+ /**
+ * @see net.sourceforge.squirrel_sql.fw.dialects.CommonHibernateDialect#getMaxPrecision(int)
+ */
+ @Override
+ public int getMaxPrecision(int dataType)
+ {
+ return 38;
+ }
+
+ /**
+ * @see net.sourceforge.squirrel_sql.fw.dialects.CommonHibernateDialect#getMaxScale(int)
+ */
+ @Override
+ public int getMaxScale(int dataType)
+ {
+ // user guide says scale can be 0 to as large as the precision. It cannot be
+ // greater than the precision.
+ return 38;
+ }
+
+ /**
+ * @see net.sourceforge.squirrel_sql.fw.dialects.CommonHibernateDialect#getPrecisionDigits(int, int)
+ */
+ @Override
+ public int getPrecisionDigits(int columnSize, int dataType)
+ {
+ // Greenplum correctly reports the size of the column in digits.
+ return columnSize;
+ }
+
+ /**
+ * @see net.sourceforge.squirrel_sql.fw.dialects.CommonHibernateDialect#getTypeName(int, int, int, int)
+ */
+ @Override
+ public String getTypeName(int code, int length, int precision, int scale) throws HibernateException
+ {
+ return _dialect.getTypeName(code, length, precision, scale);
+ }
+
+ /**
+ * @see net.sourceforge.squirrel_sql.fw.dialects.CommonHibernateDialect#supportsAccessMethods()
+ */
+ @Override
+ public boolean supportsAccessMethods()
+ {
+ // Access methods have to do with indexes. Since Greenplum disallows users from creating or changing
+ // indexes, this is unsupported
+ return false;
+ }
+
+ /**
+ * @see net.sourceforge.squirrel_sql.fw.dialects.CommonHibernateDialect#supportsAddColumn()
+ */
+ @Override
+ public boolean supportsAddColumn()
+ {
+ return false;
+ }
+
+ /**
+ * @see net.sourceforge.squirrel_sql.fw.dialects.CommonHibernateDialect#supportsAddForeignKeyConstraint()
+ */
+ @Override
+ public boolean supportsAddForeignKeyConstraint()
+ {
+ return true;
+ }
+
+ /**
+ * @see net.sourceforge.squirrel_sql.fw.dialects.CommonHibernateDialect#supportsAddUniqueConstraint()
+ */
+ @Override
+ public boolean supportsAddUniqueConstraint()
+ {
+ return true;
+ }
+
+ /**
+ * @see net.sourceforge.squirrel_sql.fw.dialects.CommonHibernateDialect#supportsAlterColumnDefault()
+ */
+ @Override
+ public boolean supportsAlterColumnDefault()
+ {
+ return true;
+ }
+
+ /**
+ * @see net.sourceforge.squirrel_sql.fw.dialects.CommonHibernateDialect#supportsAlterColumnNull()
+ */
+ @Override
+ public boolean supportsAlterColumnNull()
+ {
+ return false;
+ }
+
+ /**
+ * @see net.sourceforge.squirrel_sql.fw.dialects.CommonHibernateDialect#supportsAlterColumnType()
+ */
+ @Override
+ public boolean supportsAlterColumnType()
+ {
+ return false;
+ }
+
+ /**
+ * @see net.sourceforge.squirrel_sql.fw.dialects.CommonHibernateDialect#supportsAlterSequence()
+ */
+ @Override
+ public boolean supportsAlterSequence()
+ {
+ return true;
+ }
+
+ /**
+ * @see net.sourceforge.squirrel_sql.fw.dialects.CommonHibernateDialect#supportsAutoIncrement()
+ */
+ @Override
+ public boolean supportsAutoIncrement()
+ {
+ return false;
+ }
+
+ /**
+ * @see net.sourceforge.squirrel_sql.fw.dialects.CommonHibernateDialect#supportsCheckOptionsForViews()
+ */
+ @Override
+ public boolean supportsCheckOptionsForViews()
+ {
+ return false;
+ }
+
+ /**
+ * @see net.sourceforge.squirrel_sql.fw.dialects.CommonHibernateDialect#supportsColumnComment()
+ */
+ @Override
+ public boolean supportsColumnComment()
+ {
+ return false;
+ }
+
+ /**
+ * @see net.sourceforge.squirrel_sql.fw.dialects.CommonHibernateDialect#supportsCorrelatedSubQuery()
+ */
+ @Override
+ public boolean supportsCorrelatedSubQuery()
+ {
+ // Although Greenplum claims to support correlated sub-queries, the type of sub-query we want is not
+ // supported:
+ // update TOTABLE t set t.MYDESC =
+ // (
+ // select
+ // f.MYDESC
+ // from FROMTABLE f
+ // where f.myid = t.myid
+ // )
+ // Furthermore, the only refactoring that currently uses this is MergeTable which also requires
+ // add column support, which Greenplum also doesn't seem to have.
+ return false;
+ }
+
+ /**
+ * @see net.sourceforge.squirrel_sql.fw.dialects.CommonHibernateDialect#supportsCreateIndex()
+ */
+ @Override
+ public boolean supportsCreateIndex()
+ {
+ // Since Greenplum disallows users from creating or changing indexes, this is unsupported
+ return false;
+ }
+
+ /**
+ * @see net.sourceforge.squirrel_sql.fw.dialects.CommonHibernateDialect#supportsCreateSequence()
+ */
+ @Override
+ public boolean supportsCreateSequence()
+ {
+ return true;
+ }
+
+ /**
+ * @see net.sourceforge.squirrel_sql.fw.dialects.CommonHibernateDialect#supportsCreateTable()
+ */
+ @Override
+ public boolean supportsCreateTable()
+ {
+ return true;
+ }
+
+ /**
+ * @see net.sourceforge.squirrel_sql.fw.dialects.CommonHibernateDialect#supportsCreateView()
+ */
+ @Override
+ public boolean supportsCreateView()
+ {
+ return true;
+ }
+
+ /**
+ * @see net.sourceforge.squirrel_sql.fw.dialects.CommonHibernateDialect#supportsDropColumn()
+ */
+ @Override
+ public boolean supportsDropColumn()
+ {
+ return false;
+ }
+
+ /**
+ * @see net.sourceforge.squirrel_sql.fw.dialects.CommonHibernateDialect#supportsDropConstraint()
+ */
+ @Override
+ public boolean supportsDropConstraint()
+ {
+ return true;
+ }
+
+ /**
+ * @see net.sourceforge.squirrel_sql.fw.dialects.CommonHibernateDialect#supportsDropIndex()
+ */
+ @Override
+ public boolean supportsDropIndex()
+ {
+ // Since Greenplum disallows users from creating or changing indexes, this is unsupported
+ return false;
+ }
+
+ /**
+ * @see net.sourceforge.squirrel_sql.fw.dialects.CommonHibernateDialect#supportsDropSequence()
+ */
+ @Override
+ public boolean supportsDropSequence()
+ {
+ return true;
+ }
+
+ /**
+ * @see net.sourceforge.squirrel_sql.fw.dialects.CommonHibernateDialect#supportsDropView()
+ */
+ @Override
+ public boolean supportsDropView()
+ {
+ return true;
+ }
+
+ /**
+ * @see net.sourceforge.squirrel_sql.fw.dialects.CommonHibernateDialect#supportsEmptyTables()
+ */
+ @Override
+ public boolean supportsEmptyTables()
+ {
+ return false;
+ }
+
+ /**
+ * @see net.sourceforge.squirrel_sql.fw.dialects.CommonHibernateDialect#supportsIndexes()
+ */
+ @Override
+ public boolean supportsIndexes()
+ {
+ // Since Greenplum disallows users from creating or changing indexes, this is unsupported
+ return false;
+ }
+
+ /**
+ * @see net.sourceforge.squirrel_sql.fw.dialects.CommonHibernateDialect#supportsInsertInto()
+ */
+ @Override
+ public boolean supportsInsertInto()
+ {
+ return true;
+ }
+
+ /**
+ * @see net.sourceforge.squirrel_sql.fw.dialects.CommonHibernateDialect#supportsMultipleRowInserts()
+ */
+ @Override
+ public boolean supportsMultipleRowInserts()
+ {
+ return false;
+ }
+
+ /**
+ * @see net.sourceforge.squirrel_sql.fw.dialects.CommonHibernateDialect#supportsProduct(java.lang.String,
+ * java.lang.String)
+ */
+ @Override
+ public boolean supportsProduct(String databaseProductName, String databaseProductVersion)
+ {
+ if (databaseProductName == null) { return false; }
+ if (databaseProductName.trim().startsWith("PostgreSQL"))
+ {
+ // We don't yet have the need to discriminate by version.
+ return true;
+ }
+ return false;
+ }
+
+ /**
+ * @see net.sourceforge.squirrel_sql.fw.dialects.CommonHibernateDialect#supportsRenameColumn()
+ */
+ @Override
+ public boolean supportsRenameColumn()
+ {
+ return true;
+ }
+
+ /**
+ * @see net.sourceforge.squirrel_sql.fw.dialects.CommonHibernateDialect#supportsRenameTable()
+ */
+ @Override
+ public boolean supportsRenameTable()
+ {
+ return true;
+ }
+
+ /**
+ * @see net.sourceforge.squirrel_sql.fw.dialects.CommonHibernateDialect#supportsRenameView()
+ */
+ @Override
+ public boolean supportsRenameView()
+ {
+ return true;
+ }
+
+ /**
+ * @see net.sourceforge.squirrel_sql.fw.dialects.CommonHibernateDialect#supportsSchemasInTableDefinition()
+ */
+ @Override
+ public boolean supportsSchemasInTableDefinition()
+ {
+ return true;
+ }
+
+ /**
+ * @see net.sourceforge.squirrel_sql.fw.dialects.CommonHibernateDialect#supportsSequence()
+ */
+ @Override
+ public boolean supportsSequence()
+ {
+ return true;
+ }
+
+ /**
+ * @see net.sourceforge.squirrel_sql.fw.dialects.CommonHibernateDialect#supportsSequenceInformation()
+ */
+ @Override
+ public boolean supportsSequenceInformation()
+ {
+ return false;
+ }
+
+ /**
+ * @see net.sourceforge.squirrel_sql.fw.dialects.CommonHibernateDialect#supportsTablespace()
+ */
+ @Override
+ public boolean supportsTablespace()
+ {
+ return false;
+ }
+
+ /**
+ * @see net.sourceforge.squirrel_sql.fw.dialects.CommonHibernateDialect#supportsUpdate()
+ */
+ @Override
+ public boolean supportsUpdate()
+ {
+ return true;
+ }
+
+ /**
+ * @see net.sourceforge.squirrel_sql.fw.dialects.CommonHibernateDialect#supportsViewDefinition()
+ */
+ @Override
+ public boolean supportsViewDefinition()
+ {
+ return true;
+ }
+
+ /**
+ * @see net.sourceforge.squirrel_sql.fw.dialects.CommonHibernateDialect#getTableDropSQL(net.sourceforge.squirrel_sql.fw.sql.ITableInfo,
+ * boolean, boolean, net.sourceforge.squirrel_sql.fw.dialects.DatabaseObjectQualifier,
+ * net.sourceforge.squirrel_sql.fw.dialects.SqlGenerationPreferences)
+ */
+ @Override
+ public List<String> getTableDropSQL(ITableInfo tableInfo, boolean cascadeConstraints,
+ boolean isMaterializedView, DatabaseObjectQualifier qualifier, SqlGenerationPreferences prefs)
+ {
+ final boolean supportsCascade = false;
+ final boolean supportsMatViews = true;
+ return DialectUtils.getTableDropSQL(tableInfo, supportsCascade, cascadeConstraints, supportsMatViews,
+ cascadeClause, isMaterializedView, qualifier, prefs, this);
+ }
+
+ /**
+ * @see net.sourceforge.squirrel_sql.fw.dialects.CommonHibernateDialect#getColumnDropSQL(java.lang.String,
+ * java.lang.String, net.sourceforge.squirrel_sql.fw.dialects.DatabaseObjectQualifier,
+ * net.sourceforge.squirrel_sql.fw.dialects.SqlGenerationPreferences)
+ */
+ @Override
+ public String getColumnDropSQL(String tableName, String columnName, DatabaseObjectQualifier qualifier,
+ SqlGenerationPreferences prefs) throws UnsupportedOperationException
+ {
+ throw new UnsupportedOperationException(getUnsupportedMessage(this, COLUMN_DROP_TYPE));
+ }
+
+ /**
+ * @see net.sourceforge.squirrel_sql.fw.dialects.CommonHibernateDialect#getCreateIndexSQL(java.lang.String,
+ * java.lang.String, java.lang.String, java.lang.String[], boolean, java.lang.String,
+ * java.lang.String, net.sourceforge.squirrel_sql.fw.dialects.DatabaseObjectQualifier,
+ * net.sourceforge.squirrel_sql.fw.dialects.SqlGenerationPreferences)
+ */
+ @Override
+ public String getCreateIndexSQL(String indexName, String tableName, String accessMethod, String[] columns,
+ boolean unique, String tablespace, String constraints, DatabaseObjectQualifier qualifier,
+ SqlGenerationPreferences prefs)
+ {
+ throw new UnsupportedOperationException(getUnsupportedMessage(this, CREATE_INDEX_TYPE));
+ }
+
+ /**
+ * @see net.sourceforge.squirrel_sql.fw.dialects.CommonHibernateDialect#getDropIndexSQL(java.lang.String,
+ * java.lang.String, boolean, net.sourceforge.squirrel_sql.fw.dialects.DatabaseObjectQualifier,
+ * net.sourceforge.squirrel_sql.fw.dialects.SqlGenerationPreferences)
+ */
+ @Override
+ public String getDropIndexSQL(String tableName, String indexName, boolean cascade,
+ DatabaseObjectQualifier qualifier, SqlGenerationPreferences prefs)
+ {
+ throw new UnsupportedOperationException(getUnsupportedMessage(this, DROP_INDEX_TYPE));
+ }
+
+ /**
+ * @see net.sourceforge.squirrel_sql.fw.dialects.CommonHibernateDialect#getAddColumnSQL(net.sourceforge.squirrel_sql.fw.sql.TableColumnInfo,
+ * net.sourceforge.squirrel_sql.fw.dialects.DatabaseObjectQualifier,
+ * net.sourceforge.squirrel_sql.fw.dialects.SqlGenerationPreferences)
+ */
+ @Override
+ public String[] getAddColumnSQL(TableColumnInfo column, DatabaseObjectQualifier qualifier,
+ SqlGenerationPreferences prefs)
+ {
+ throw new UnsupportedOperationException(getUnsupportedMessage(this, ADD_COLUMN_TYPE));
+ }
+
+ /**
+ * @see net.sourceforge.squirrel_sql.fw.dialects.CommonHibernateDialect#getColumnNullableAlterSQL(net.sourceforge.squirrel_sql.fw.sql.TableColumnInfo,
+ * net.sourceforge.squirrel_sql.fw.dialects.DatabaseObjectQualifier,
+ * net.sourceforge.squirrel_sql.fw.dialects.SqlGenerationPreferences)
+ */
+ @Override
+ public String[] getColumnNullableAlterSQL(TableColumnInfo info, DatabaseObjectQualifier qualifier,
+ SqlGenerationPreferences prefs)
+ {
+ throw new UnsupportedOperationException(getUnsupportedMessage(this, COLUMN_NULL_ALTER_TYPE));
+ }
+
+ /**
+ * @see net.sourceforge.squirrel_sql.fw.dialects.CommonHibernateDialect#getColumnTypeAlterSQL(net.sourceforge.squirrel_sql.fw.sql.TableColumnInfo,
+ * net.sourceforge.squirrel_sql.fw.sql.TableColumnInfo,
+ * net.sourceforge.squirrel_sql.fw.dialects.DatabaseObjectQualifier,
+ * net.sourceforge.squirrel_sql.fw.dialects.SqlGenerationPreferences)
+ */
+ @Override
+ public List<String> getColumnTypeAlterSQL(TableColumnInfo from, TableColumnInfo to,
+ DatabaseObjectQualifier qualifier, SqlGenerationPreferences prefs) throws UnsupportedOperationException
+ {
+ throw new UnsupportedOperationException(getUnsupportedMessage(this, COLUMN_TYPE_ALTER_TYPE));
+
+ }
+
+ /**
+ * @see net.sourceforge.squirrel_sql.fw.dialects.CommonHibernateDialect#getColumnDefaultAlterSQL(net.sourceforge.squirrel_sql.fw.sql.TableColumnInfo,
+ * net.sourceforge.squirrel_sql.fw.dialects.DatabaseObjectQualifier,
+ * net.sourceforge.squirrel_sql.fw.dialects.SqlGenerationPreferences)
+ */
+ @Override
+ public String getColumnDefaultAlterSQL(TableColumnInfo info, DatabaseObjectQualifier qualifier,
+ SqlGenerationPreferences prefs)
+ {
+ String alterClause = DialectUtils.ALTER_COLUMN_CLAUSE;
+ boolean specifyType = false;
+ String defaultClause = DialectUtils.SET_DEFAULT_CLAUSE;
+ return DialectUtils.getColumnDefaultAlterSQL(this, info, alterClause, specifyType, defaultClause,
+ qualifier, prefs);
+ }
+
+ /**
+ * @see net.sourceforge.squirrel_sql.fw.dialects.CommonHibernateDialect#getColumnNameAlterSQL(net.sourceforge.squirrel_sql.fw.sql.TableColumnInfo,
+ * net.sourceforge.squirrel_sql.fw.sql.TableColumnInfo,
+ * net.sourceforge.squirrel_sql.fw.dialects.DatabaseObjectQualifier,
+ * net.sourceforge.squirrel_sql.fw.dialects.SqlGenerationPreferences)
+ */
+ @Override
+ public String getColumnNameAlterSQL(TableColumnInfo from, TableColumnInfo to,
+ DatabaseObjectQualifier qualifier, SqlGenerationPreferences prefs)
+ {
+ String alterClause = DialectUtils.RENAME_COLUMN_CLAUSE;
+ String renameToClause = DialectUtils.TO_CLAUSE;
+ return DialectUtils.getColumnNameAlterSQL(from, to, alterClause, renameToClause, qualifier, prefs, this);
+ }
+
+ /**
+ * @see net.sourceforge.squirrel_sql.fw.dialects.CommonHibernateDialect#getRenameTableSQL(java.lang.String,
+ * java.lang.String, net.sourceforge.squirrel_sql.fw.dialects.DatabaseObjectQualifier,
+ * net.sourceforge.squirrel_sql.fw.dialects.SqlGenerationPreferences)
+ */
+ @Override
+ public String getRenameTableSQL(String oldTableName, String newTableName,
+ DatabaseObjectQualifier qualifier, SqlGenerationPreferences prefs)
+ {
+ return DialectUtils.getRenameTableSQL(oldTableName, newTableName, qualifier, prefs, this);
+ }
+
+ /**
+ * @see net.sourceforge.squirrel_sql.fw.dialects.CommonHibernateDialect#getCreateViewSQL(java.lang.String,
+ * java.lang.String, java.lang.String,
+ * net.sourceforge.squirrel_sql.fw.dialects.DatabaseObjectQualifier,
+ * net.sourceforge.squirrel_sql.fw.dialects.SqlGenerationPreferences)
+ */
+ @Override
+ public String getCreateViewSQL(String viewName, String definition, String checkOption,
+ DatabaseObjectQualifier qualifier, SqlGenerationPreferences prefs)
+ {
+ return DialectUtils.getCreateViewSQL(viewName, definition, checkOption, qualifier, prefs, this);
+ }
+
+ /**
+ * @see net.sourceforge.squirrel_sql.fw.dialects.CommonHibernateDialect#getRenameViewSQL(java.lang.String,
+ * java.lang.String, net.sourceforge.squirrel_sql.fw.dialects.DatabaseObjectQualifier,
+ * net.sourceforge.squirrel_sql.fw.dialects.SqlGenerationPreferences)
+ */
+ @Override
+ public String[] getRenameViewSQL(String oldViewName, String newViewName,
+ DatabaseObjectQualifier qualifier, SqlGenerationPreferences prefs)
+ {
+
+ String commandPrefix = DialectUtils.ALTER_VIEW_CLAUSE;
+ String renameClause = DialectUtils.RENAME_TO_CLAUSE;
+ return new String[] { DialectUtils.getRenameViewSQL(commandPrefix, renameClause, oldViewName,
+ newViewName, qualifier, prefs, this) };
+ }
+
+ /**
+ * @see net.sourceforge.squirrel_sql.fw.dialects.CommonHibernateDialect#getViewDefinitionSQL(java.lang.String,
+ * net.sourceforge.squirrel_sql.fw.dialects.DatabaseObjectQualifier,
+ * net.sourceforge.squirrel_sql.fw.dialects.SqlGenerationPreferences)
+ */
+ @Override
+ public String getViewDefinitionSQL(String viewName, DatabaseObjectQualifier qualifier,
+ SqlGenerationPreferences prefs)
+ {
+ return "SELECT 'create or replace view ' || v.VIEWNAME || ' as ' || "
+ + "v.definition FROM _v_view v, _v_objs_owned o " + "where v.objid = o.objid "
+ + "and o.DATABASE = '" + qualifier.getCatalog() + "' " + "and v.VIEWNAME = '" + viewName + "'";
+ }
+
+ /**
+ * @see net.sourceforge.squirrel_sql.fw.dialects.CommonHibernateDialect#getCreateSequenceSQL(java.lang.String,
+ * java.lang.String, java.lang.String, java.lang.String, java.lang.String, java.lang.String, boolean,
+ * net.sourceforge.squirrel_sql.fw.dialects.DatabaseObjectQualifier,
+ * net.sourceforge.squirrel_sql.fw.dialects.SqlGenerationPreferences)
+ */
+ @Override
+ public String getCreateSequenceSQL(String sequenceName, String increment, String minimum, String maximum,
+ String start, String cache, boolean cycle, DatabaseObjectQualifier qualifier,
+ SqlGenerationPreferences prefs)
+ {
+ final String minimumClause = DialectUtils.MINVALUE_CLAUSE;
+ final String maximumClause = DialectUtils.MAXVALUE_CLAUSE;
+
+ String cycleClause = DialectUtils.CYCLE_CLAUSE;
+ if (!cycle)
+ {
+ cycleClause = DialectUtils.NO_CYCLE_CLAUSE;
+ }
+
+ return DialectUtils.getCreateSequenceSQL(sequenceName, increment, minimumClause, minimum,
+ maximumClause, maximum, start, cache, cycleClause, qualifier, prefs, this);
+ }
+
+ /**
+ * @see net.sourceforge.squirrel_sql.fw.dialects.CommonHibernateDialect#getAlterSequenceSQL(java.lang.String,
+ * java.lang.String, java.lang.String, java.lang.String, java.lang.String, java.lang.String, boolean,
+ * net.sourceforge.squirrel_sql.fw.dialects.DatabaseObjectQualifier...
[truncated message content] |
|
From: <wi...@us...> - 2011-06-05 19:45:58
|
Revision: 6294
http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=6294&view=rev
Author: wis775
Date: 2011-06-05 19:45:51 +0000 (Sun, 05 Jun 2011)
Log Message:
-----------
(Syntax Plugin) Add a configuration, that "Copy as RTF" is the default copy action for shortcuts like CTRL+C
Modified Paths:
--------------
trunk/sql12/doc/src/main/resources/changes.txt
trunk/sql12/plugins/syntax/src/main/java/net/sourceforge/squirrel_sql/plugins/syntax/SyntaxPreferences.java
trunk/sql12/plugins/syntax/src/main/java/net/sourceforge/squirrel_sql/plugins/syntax/SyntaxPreferencesPanel.java
trunk/sql12/plugins/syntax/src/main/java/net/sourceforge/squirrel_sql/plugins/syntax/rsyntax/SquirrelRSyntaxTextArea.java
trunk/sql12/plugins/syntax/src/main/resources/net/sourceforge/squirrel_sql/plugins/syntax/I18NStrings.properties
trunk/sql12/plugins/syntax/src/test/java/net/sourceforge/squirrel_sql/plugins/syntax/SyntaxPreferencesTest.java
Modified: trunk/sql12/doc/src/main/resources/changes.txt
===================================================================
--- trunk/sql12/doc/src/main/resources/changes.txt 2011-06-05 17:39:52 UTC (rev 6293)
+++ trunk/sql12/doc/src/main/resources/changes.txt 2011-06-05 19:45:51 UTC (rev 6294)
@@ -12,7 +12,9 @@
Feature Request 1744964: Copy text from the SQL editor panel as rich text.
- This functionality is available via the pop-up menu and the tools pop-up. To use this, the RSyntax editor (Syntax Plugin) must be activated.
+ This functionality is available via the pop-up menu and the tools pop-up. Additional this mode can be activated for copy shortcuts.
+ See: Session Properties => Syntax => Copy shortcuts use the "Rich Text Format"
+ To use this, the RSyntax editor (Syntax Plugin) must be activated.
Source Tabs:
Syntax highlighting is used for displaying the source of database objects, if the syntax plugin is installed.
Modified: trunk/sql12/plugins/syntax/src/main/java/net/sourceforge/squirrel_sql/plugins/syntax/SyntaxPreferences.java
===================================================================
--- trunk/sql12/plugins/syntax/src/main/java/net/sourceforge/squirrel_sql/plugins/syntax/SyntaxPreferences.java 2011-06-05 17:39:52 UTC (rev 6293)
+++ trunk/sql12/plugins/syntax/src/main/java/net/sourceforge/squirrel_sql/plugins/syntax/SyntaxPreferences.java 2011-06-05 19:45:51 UTC (rev 6294)
@@ -122,6 +122,10 @@
private boolean _lineNumbersEnabled = false;
+ /**
+ * Indicates, that copy in rich text format should be used as default copy action (if possible)
+ */
+ private boolean _useCopyAsRtf = false;
public SyntaxPreferences()
{
@@ -727,4 +731,18 @@
return _propChgReporter;
}
+
+ /**
+ * @return the useCopyAsRtf
+ */
+ public boolean isUseCopyAsRtf() {
+ return _useCopyAsRtf;
+ }
+
+ /**
+ * @param _useCopyAsRtf the useCopyAsRtf to set
+ */
+ public void setUseCopyAsRtf(boolean useCopyAsRtf) {
+ this._useCopyAsRtf = useCopyAsRtf;
+ }
}
Modified: trunk/sql12/plugins/syntax/src/main/java/net/sourceforge/squirrel_sql/plugins/syntax/SyntaxPreferencesPanel.java
===================================================================
--- trunk/sql12/plugins/syntax/src/main/java/net/sourceforge/squirrel_sql/plugins/syntax/SyntaxPreferencesPanel.java 2011-06-05 17:39:52 UTC (rev 6293)
+++ trunk/sql12/plugins/syntax/src/main/java/net/sourceforge/squirrel_sql/plugins/syntax/SyntaxPreferencesPanel.java 2011-06-05 19:45:51 UTC (rev 6294)
@@ -191,6 +191,9 @@
// i18n[syntax.lineNumbersEnabled=Enable line numbers]
String LINE_NUMBERS_ENABLES = s_stringMgr.getString("syntax.lineNumbersEnabled");
+ // i18n[syntax.useCopyAsRtf=Copy in rich text format per default]
+ String USE_COPY_AS_RTF = s_stringMgr.getString("syntax.useCopyAsRtf");
+
}
private final JRadioButton _netbeansActiveOpt = new JRadioButton(i18n.NETBEANS);
@@ -202,6 +205,8 @@
private final JTextField _txtTextLimitLineWidth = new JTextField();
private final JCheckBox _chkHighlightCurrentLine = new JCheckBox(i18n.HIGHLIGHT_CURRENT_LINE);
private final JCheckBox _chkLineNumbersEnabled = new JCheckBox(i18n.LINE_NUMBERS_ENABLES);
+
+ private final JCheckBox _useCopyAsRtf = new JCheckBox(i18n.USE_COPY_AS_RTF);
private StylesListSelectionListener _listLis;
@@ -257,9 +262,12 @@
_txtTextLimitLineWidth.setText("" + prefs.getTextLimitLineWidth());
+ _useCopyAsRtf.setSelected(prefs.isUseCopyAsRtf());
+
_stylesList.loadData(prefs);
_styleMaintPnl.setStyle(_stylesList.getSelectedSyntaxStyle());
-
+
+
updateControlStatus();
}
@@ -289,7 +297,8 @@
prefs.setTextLimitLineVisible(_chkTextLimitLineVisible.isSelected());
prefs.setHighlightCurrentLine(_chkHighlightCurrentLine.isSelected());
prefs.setLineNumbersEnabled(_chkLineNumbersEnabled.isSelected());
-
+ prefs.setUseCopyAsRtf(_useCopyAsRtf.isSelected());
+
int limit = 80;
try
@@ -326,26 +335,27 @@
prefs.setDataTypeStyle(_stylesList.getSyntaxStyleAt(StylesList.IStylesListIndices.DATA_TYPES));
}
- private void updateControlStatus()
- {
- final boolean useOsterControl = _osterActiveOpt.isSelected();
- final boolean useNetbeansControl = _netbeansActiveOpt.isSelected();
- final boolean useRSyntaxControl = _rsyntaxActiveOpt.isSelected();
- final boolean usePlainControl = _plainActiveOpt.isSelected();
+ private void updateControlStatus()
+ {
+ final boolean useOsterControl = _osterActiveOpt.isSelected();
+ final boolean useNetbeansControl = _netbeansActiveOpt.isSelected();
+ final boolean useRSyntaxControl = _rsyntaxActiveOpt.isSelected();
+ final boolean usePlainControl = _plainActiveOpt.isSelected();
- _stylesList.setEnabled(useOsterControl || useNetbeansControl || useRSyntaxControl);
- _styleMaintPnl.setEnabled(useOsterControl || useNetbeansControl || useRSyntaxControl);
+ _stylesList.setEnabled(useOsterControl || useNetbeansControl || useRSyntaxControl);
+ _styleMaintPnl.setEnabled(useOsterControl || useNetbeansControl || useRSyntaxControl);
- _chkTextLimitLineVisible.setEnabled(useNetbeansControl || useRSyntaxControl);
- _txtTextLimitLineWidth.setEnabled(useNetbeansControl || useRSyntaxControl);
+ _chkTextLimitLineVisible.setEnabled(useNetbeansControl || useRSyntaxControl);
+ _txtTextLimitLineWidth.setEnabled(useNetbeansControl || useRSyntaxControl);
- if(useNetbeansControl || useRSyntaxControl)
- {
- _txtTextLimitLineWidth.setEnabled(_chkTextLimitLineVisible.isSelected());
- }
+ if(useNetbeansControl || useRSyntaxControl)
+ {
+ _txtTextLimitLineWidth.setEnabled(_chkTextLimitLineVisible.isSelected());
+ }
- _chkHighlightCurrentLine.setEnabled(useRSyntaxControl);
- _chkLineNumbersEnabled.setEnabled(useRSyntaxControl);
+ _chkHighlightCurrentLine.setEnabled(useRSyntaxControl);
+ _chkLineNumbersEnabled.setEnabled(useRSyntaxControl);
+ _useCopyAsRtf.setEnabled(useRSyntaxControl);
}
private void createUserInterface(SyntaxPreferences prefs,
@@ -474,6 +484,9 @@
gbc = new GridBagConstraints(0,6,1,1,0,0,GridBagConstraints.WEST, GridBagConstraints.NONE, new Insets(5,5,5,5), 0,0);
pnlRet.add(_chkLineNumbersEnabled, gbc);
+ gbc = new GridBagConstraints(0,7,1,1,0,0,GridBagConstraints.WEST, GridBagConstraints.NONE, new Insets(5,5,5,5), 0,0);
+ pnlRet.add(_useCopyAsRtf, gbc);
+
return pnlRet;
}
Modified: trunk/sql12/plugins/syntax/src/main/java/net/sourceforge/squirrel_sql/plugins/syntax/rsyntax/SquirrelRSyntaxTextArea.java
===================================================================
--- trunk/sql12/plugins/syntax/src/main/java/net/sourceforge/squirrel_sql/plugins/syntax/rsyntax/SquirrelRSyntaxTextArea.java 2011-06-05 17:39:52 UTC (rev 6293)
+++ trunk/sql12/plugins/syntax/src/main/java/net/sourceforge/squirrel_sql/plugins/syntax/rsyntax/SquirrelRSyntaxTextArea.java 2011-06-05 19:45:51 UTC (rev 6294)
@@ -1,32 +1,36 @@
package net.sourceforge.squirrel_sql.plugins.syntax.rsyntax;
+import java.awt.event.ActionEvent;
+import java.awt.event.MouseEvent;
+
+import javax.swing.InputMap;
+import javax.swing.JPopupMenu;
+import javax.swing.KeyStroke;
+import javax.swing.event.ChangeListener;
+import javax.swing.event.UndoableEditListener;
+import javax.swing.text.DefaultCaret;
+import javax.swing.text.DefaultEditorKit;
+import javax.swing.text.Document;
+
import net.sourceforge.squirrel_sql.client.session.ISession;
import net.sourceforge.squirrel_sql.client.session.SQLTokenListener;
+import net.sourceforge.squirrel_sql.client.session.mainpanel.IUndoHandler;
+import net.sourceforge.squirrel_sql.client.session.parser.IParserEventsProcessor;
import net.sourceforge.squirrel_sql.client.session.parser.ParserEventsAdapter;
-import net.sourceforge.squirrel_sql.client.session.parser.IParserEventsProcessor;
import net.sourceforge.squirrel_sql.client.session.parser.kernel.ErrorInfo;
-import net.sourceforge.squirrel_sql.client.session.mainpanel.IUndoHandler;
import net.sourceforge.squirrel_sql.fw.id.IIdentifier;
import net.sourceforge.squirrel_sql.fw.util.StringManager;
import net.sourceforge.squirrel_sql.fw.util.StringManagerFactory;
import net.sourceforge.squirrel_sql.plugins.syntax.KeyManager;
import net.sourceforge.squirrel_sql.plugins.syntax.SyntaxPreferences;
import net.sourceforge.squirrel_sql.plugins.syntax.rsyntax.search.SquirrelRSyntaxSearchEngine;
+
import org.fife.ui.rsyntaxtextarea.RSyntaxDocument;
import org.fife.ui.rsyntaxtextarea.RSyntaxTextArea;
import org.fife.ui.rsyntaxtextarea.RSyntaxTextAreaEditorKit;
import org.fife.ui.rsyntaxtextarea.SyntaxScheme;
import org.fife.ui.rtextarea.RTextAreaUI;
-import javax.swing.*;
-import javax.swing.event.UndoableEditListener;
-import javax.swing.event.ChangeListener;
-import javax.swing.text.Document;
-import javax.swing.text.DefaultCaret;
-import java.awt.*;
-import java.awt.event.MouseEvent;
-import java.awt.event.ActionEvent;
-
public class SquirrelRSyntaxTextArea extends RSyntaxTextArea
{
private static final StringManager s_stringMgr =
@@ -56,7 +60,12 @@
_rSyntaxHighlightTokenMatcherProxy.setDelegate(_propertiesWrapper.getSyntaxHighlightTokenMatcher(session, this, sqlEntryPanelIdentifier));
+
+ modifiyKeystrokesFromPreferences(prefs);
+
+
updateFromPreferences();
+
new KeyManager(this);
@@ -78,7 +87,27 @@
}
- protected RTextAreaUI createRTextAreaUI()
+ /**
+ * Modifies the current {@link InputMap} of this component according to the actual preferences.
+ * Within the preferences of the syntax plugin, the user can change the behavior of some key strokes. e.g. the copy action.
+ * Because we have no access to the syntax preferences at the moment, the UI is created, we have to modify them after the creation.
+ * @param prefs Preferences to use.
+ */
+ private void modifiyKeystrokesFromPreferences(SyntaxPreferences prefs) {
+ InputMap shared = getInputMap();
+ if(prefs.isUseCopyAsRtf()){
+ // Replace the default copy behavior for all key bindings
+ KeyStroke[] allKeys = shared.allKeys();
+ for (KeyStroke keyStroke : allKeys) {
+ Object object = shared.get(keyStroke);
+ if(DefaultEditorKit.copyAction.equals(object)){
+ shared.put(keyStroke, RSyntaxTextAreaEditorKit.rstaCopyAsRtfAction);
+ }
+ }
+ }
+ }
+
+protected RTextAreaUI createRTextAreaUI()
{
// Will be called from the super class constructor
SquirreLRSyntaxTextAreaUI ret = new SquirreLRSyntaxTextAreaUI(this);
Modified: trunk/sql12/plugins/syntax/src/main/resources/net/sourceforge/squirrel_sql/plugins/syntax/I18NStrings.properties
===================================================================
--- trunk/sql12/plugins/syntax/src/main/resources/net/sourceforge/squirrel_sql/plugins/syntax/I18NStrings.properties 2011-06-05 17:39:52 UTC (rev 6293)
+++ trunk/sql12/plugins/syntax/src/main/resources/net/sourceforge/squirrel_sql/plugins/syntax/I18NStrings.properties 2011-06-05 19:45:51 UTC (rev 6294)
@@ -39,8 +39,8 @@
syntax.textLimitLineWidth=Text limit line width
syntax.highlightCurrentLine=Highlight current line
syntax.lineNumbersEnabled=Enable line numbers
+syntax.useCopyAsRtf=Copy shortcuts use the "Rich Text Format"
-
syntax.abrevclose=Close
syntax.abrevNewLineNote=Use \\n in corrections for line break. Note: Bookmarks are more powerful than abreviations.
Modified: trunk/sql12/plugins/syntax/src/test/java/net/sourceforge/squirrel_sql/plugins/syntax/SyntaxPreferencesTest.java
===================================================================
--- trunk/sql12/plugins/syntax/src/test/java/net/sourceforge/squirrel_sql/plugins/syntax/SyntaxPreferencesTest.java 2011-06-05 17:39:52 UTC (rev 6293)
+++ trunk/sql12/plugins/syntax/src/test/java/net/sourceforge/squirrel_sql/plugins/syntax/SyntaxPreferencesTest.java 2011-06-05 19:45:51 UTC (rev 6294)
@@ -22,6 +22,7 @@
import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
import net.sourceforge.squirrel_sql.AbstractSerializableTest;
@@ -166,4 +167,11 @@
classUnderTest.setWhiteSpaceStyle(testStyle);
assertEquals(testStyle, classUnderTest.getWhiteSpaceStyle());
}
+
+ @Test
+ public void testIsUseCopyAsRtf() throws Exception
+ {
+ classUnderTest.setUseCopyAsRtf(true);
+ assertTrue(classUnderTest.isUseCopyAsRtf());
+ }
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ger...@us...> - 2011-06-05 20:35:05
|
Revision: 6295
http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=6295&view=rev
Author: gerdwagner
Date: 2011-06-05 20:34:58 +0000 (Sun, 05 Jun 2011)
Log Message:
-----------
MSSQL Plugin:
- Added display of triggers source code.
- If two views with same name in different schemas exist now the views' sourcecode is
displayed correctly according to the selected Object tree node.
Thanks to damluar for the patch (Patch ID: 3310900)
Modified Paths:
--------------
trunk/sql12/doc/src/main/resources/changes.txt
trunk/sql12/plugins/mssql/src/main/java/net/sourceforge/squirrel_sql/plugins/mssql/MssqlPlugin.java
trunk/sql12/plugins/mssql/src/main/java/net/sourceforge/squirrel_sql/plugins/mssql/tab/ViewSourceTab.java
trunk/sql12/plugins/mssql/src/main/resources/net/sourceforge/squirrel_sql/plugins/mssql/tab/I18NStrings.properties
Added Paths:
-----------
trunk/sql12/plugins/mssql/src/main/java/net/sourceforge/squirrel_sql/plugins/mssql/exp/
trunk/sql12/plugins/mssql/src/main/java/net/sourceforge/squirrel_sql/plugins/mssql/exp/MssqlTableTriggerExtractorImpl.java
trunk/sql12/plugins/mssql/src/main/java/net/sourceforge/squirrel_sql/plugins/mssql/tab/TriggerDetailsTab.java
trunk/sql12/plugins/mssql/src/main/java/net/sourceforge/squirrel_sql/plugins/mssql/tab/TriggerSourceTab.java
Modified: trunk/sql12/doc/src/main/resources/changes.txt
===================================================================
--- trunk/sql12/doc/src/main/resources/changes.txt 2011-06-05 19:45:51 UTC (rev 6294)
+++ trunk/sql12/doc/src/main/resources/changes.txt 2011-06-05 20:34:58 UTC (rev 6295)
@@ -7,6 +7,13 @@
Enhancements:
+MSSQL Plugin:
+ - Added display of triggers source code.
+ - If two views with same name in different schemas exist now the views' source code is
+ displayed correctly according to the selected Object tree node.
+ Thanks to damluar for the patch (Patch ID: 3310900)
+
+
New Plugin: Greenplum DB Plugin
New Plugin for the Greenplum DB. Thanks to Adam Winn for the patch (Patch ID 3217167)
Modified: trunk/sql12/plugins/mssql/src/main/java/net/sourceforge/squirrel_sql/plugins/mssql/MssqlPlugin.java
===================================================================
--- trunk/sql12/plugins/mssql/src/main/java/net/sourceforge/squirrel_sql/plugins/mssql/MssqlPlugin.java 2011-06-05 19:45:51 UTC (rev 6294)
+++ trunk/sql12/plugins/mssql/src/main/java/net/sourceforge/squirrel_sql/plugins/mssql/MssqlPlugin.java 2011-06-05 20:34:58 UTC (rev 6295)
@@ -18,11 +18,6 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-import javax.swing.Action;
-import javax.swing.JMenu;
-import javax.swing.event.MenuEvent;
-import javax.swing.event.MenuListener;
-
import net.sourceforge.squirrel_sql.client.IApplication;
import net.sourceforge.squirrel_sql.client.action.ActionCollection;
import net.sourceforge.squirrel_sql.client.gui.session.ObjectTreeInternalFrame;
@@ -37,41 +32,37 @@
import net.sourceforge.squirrel_sql.client.session.IObjectTreeAPI;
import net.sourceforge.squirrel_sql.client.session.ISession;
import net.sourceforge.squirrel_sql.client.session.mainpanel.objecttree.ObjectTreeNode;
+import net.sourceforge.squirrel_sql.client.session.mainpanel.objecttree.expanders.TableWithChildNodesExpander;
import net.sourceforge.squirrel_sql.fw.datasetviewer.DataSetException;
import net.sourceforge.squirrel_sql.fw.datasetviewer.ResultSetDataSet;
import net.sourceforge.squirrel_sql.fw.dialects.DialectFactory;
import net.sourceforge.squirrel_sql.fw.gui.GUIUtils;
import net.sourceforge.squirrel_sql.fw.preferences.IQueryTokenizerPreferenceBean;
-import net.sourceforge.squirrel_sql.fw.sql.DatabaseObjectType;
-import net.sourceforge.squirrel_sql.fw.sql.IDatabaseObjectInfo;
-import net.sourceforge.squirrel_sql.fw.sql.ISQLConnection;
-import net.sourceforge.squirrel_sql.fw.sql.ITableInfo;
-import net.sourceforge.squirrel_sql.fw.sql.SQLDatabaseMetaData;
+import net.sourceforge.squirrel_sql.fw.sql.*;
import net.sourceforge.squirrel_sql.fw.util.FileWrapper;
import net.sourceforge.squirrel_sql.fw.util.IResources;
import net.sourceforge.squirrel_sql.fw.util.StringManager;
import net.sourceforge.squirrel_sql.fw.util.StringManagerFactory;
import net.sourceforge.squirrel_sql.fw.util.log.ILogger;
import net.sourceforge.squirrel_sql.fw.util.log.LoggerController;
-import net.sourceforge.squirrel_sql.plugins.mssql.action.GenerateSqlAction;
-import net.sourceforge.squirrel_sql.plugins.mssql.action.IndexDefragAction;
-import net.sourceforge.squirrel_sql.plugins.mssql.action.ScriptProcedureAction;
-import net.sourceforge.squirrel_sql.plugins.mssql.action.ScriptProcedureExecAction;
-import net.sourceforge.squirrel_sql.plugins.mssql.action.ShowStatisticsAction;
-import net.sourceforge.squirrel_sql.plugins.mssql.action.ShrinkDatabaseAction;
-import net.sourceforge.squirrel_sql.plugins.mssql.action.ShrinkDatabaseFileAction;
-import net.sourceforge.squirrel_sql.plugins.mssql.action.TruncateLogAction;
-import net.sourceforge.squirrel_sql.plugins.mssql.action.UpdateStatisticsAction;
+import net.sourceforge.squirrel_sql.plugins.mssql.action.*;
import net.sourceforge.squirrel_sql.plugins.mssql.event.IndexIterationListener;
+import net.sourceforge.squirrel_sql.plugins.mssql.exp.MssqlTableTriggerExtractorImpl;
import net.sourceforge.squirrel_sql.plugins.mssql.gui.MonitorPanel;
import net.sourceforge.squirrel_sql.plugins.mssql.prefs.MSSQLPreferenceBean;
import net.sourceforge.squirrel_sql.plugins.mssql.prefs.PreferencesManager;
import net.sourceforge.squirrel_sql.plugins.mssql.sql.dbfile.DatabaseFile;
import net.sourceforge.squirrel_sql.plugins.mssql.sql.dbfile.DatabaseFileInfo;
+import net.sourceforge.squirrel_sql.plugins.mssql.tab.TriggerDetailsTab;
+import net.sourceforge.squirrel_sql.plugins.mssql.tab.TriggerSourceTab;
import net.sourceforge.squirrel_sql.plugins.mssql.tab.ViewSourceTab;
import net.sourceforge.squirrel_sql.plugins.mssql.tokenizer.MSSQLQueryTokenizer;
import net.sourceforge.squirrel_sql.plugins.mssql.util.MssqlIntrospector;
+import javax.swing.*;
+import javax.swing.event.MenuEvent;
+import javax.swing.event.MenuListener;
+
public class MssqlPlugin extends net.sourceforge.squirrel_sql.client.plugin.DefaultSessionPlugin {
private final static ILogger s_log = LoggerController.createLogger(MssqlPlugin.class);
@@ -282,6 +273,13 @@
_treeAPI.addDetailTab(DatabaseObjectType.VIEW, new ViewSourceTab());
_session = iSession;
+
+ TableWithChildNodesExpander trigExp = new TableWithChildNodesExpander();
+ trigExp.setTableTriggerExtractor(new MssqlTableTriggerExtractorImpl());
+ _treeAPI.addExpander(DatabaseObjectType.TABLE, trigExp);
+
+ _treeAPI.addDetailTab(DatabaseObjectType.TRIGGER, new TriggerDetailsTab());
+ _treeAPI.addDetailTab(DatabaseObjectType.TRIGGER, new TriggerSourceTab("The source of the trigger"));
MonitorPanel monitorPanel = new MonitorPanel();
iSession.addMainTab(monitorPanel);
Added: trunk/sql12/plugins/mssql/src/main/java/net/sourceforge/squirrel_sql/plugins/mssql/exp/MssqlTableTriggerExtractorImpl.java
===================================================================
--- trunk/sql12/plugins/mssql/src/main/java/net/sourceforge/squirrel_sql/plugins/mssql/exp/MssqlTableTriggerExtractorImpl.java (rev 0)
+++ trunk/sql12/plugins/mssql/src/main/java/net/sourceforge/squirrel_sql/plugins/mssql/exp/MssqlTableTriggerExtractorImpl.java 2011-06-05 20:34:58 UTC (rev 6295)
@@ -0,0 +1,54 @@
+package net.sourceforge.squirrel_sql.plugins.mssql.exp;
+
+import net.sourceforge.squirrel_sql.client.session.mainpanel.objecttree.expanders.ITableTriggerExtractor;
+import net.sourceforge.squirrel_sql.fw.sql.IDatabaseObjectInfo;
+import net.sourceforge.squirrel_sql.fw.util.log.ILogger;
+import net.sourceforge.squirrel_sql.fw.util.log.LoggerController;
+
+import java.sql.PreparedStatement;
+import java.sql.SQLException;
+
+/**
+ * Provides the query and parameter binding behavior for MS SQL Server's trigger catalog.
+ *
+ * @author damluar
+ */
+public class MssqlTableTriggerExtractorImpl implements ITableTriggerExtractor {
+
+ /** Logger for this class */
+ private final static ILogger s_log =
+ LoggerController.createLogger(MssqlTableTriggerExtractorImpl.class);
+
+ /** The query that finds the triggers for a given table */
+ private static String SQL =
+ "SELECT sys.triggers.name AS [trigger] " +
+ "FROM sys.schemas JOIN " +
+ "sys.tables ON sys.schemas.schema_id = sys.tables.schema_id JOIN " +
+ "sys.triggers ON sys.tables.object_id = sys.triggers.parent_id " +
+ "WHERE sys.tables.name = ? " +
+ "AND sys.schemas.name = ?";
+
+ /**
+ * @see net.sourceforge.squirrel_sql.client.session.mainpanel.objecttree.expanders.ITableTriggerExtractor#bindParamters(java.sql.PreparedStatement, net.sourceforge.squirrel_sql.fw.sql.IDatabaseObjectInfo)
+ */
+ public void bindParamters(PreparedStatement pstmt, IDatabaseObjectInfo dbo)
+ throws SQLException
+ {
+ if (s_log.isDebugEnabled()) {
+ s_log.debug("Binding table name "+dbo.getSimpleName()+
+ " as first bind value");
+ s_log.debug("Binding schema name "+dbo.getSchemaName()+
+ " as second bind value");
+ }
+ pstmt.setString(1, dbo.getSimpleName());
+ pstmt.setString(2, dbo.getSchemaName());
+ }
+
+ /**
+ * @see net.sourceforge.squirrel_sql.client.session.mainpanel.objecttree.expanders.ITableTriggerExtractor#getTableTriggerQuery()
+ */
+ public String getTableTriggerQuery() {
+ return SQL;
+ }
+
+}
Added: trunk/sql12/plugins/mssql/src/main/java/net/sourceforge/squirrel_sql/plugins/mssql/tab/TriggerDetailsTab.java
===================================================================
--- trunk/sql12/plugins/mssql/src/main/java/net/sourceforge/squirrel_sql/plugins/mssql/tab/TriggerDetailsTab.java (rev 0)
+++ trunk/sql12/plugins/mssql/src/main/java/net/sourceforge/squirrel_sql/plugins/mssql/tab/TriggerDetailsTab.java 2011-06-05 20:34:58 UTC (rev 6295)
@@ -0,0 +1,99 @@
+package net.sourceforge.squirrel_sql.plugins.mssql.tab;
+/*
+ * Copyright (C) 2006 Rob Manning
+ * man...@us...
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+
+import net.sourceforge.squirrel_sql.client.session.ISession;
+import net.sourceforge.squirrel_sql.client.session.mainpanel.objecttree.tabs.BasePreparedStatementTab;
+import net.sourceforge.squirrel_sql.fw.sql.IDatabaseObjectInfo;
+import net.sourceforge.squirrel_sql.fw.util.StringManager;
+import net.sourceforge.squirrel_sql.fw.util.StringManagerFactory;
+import net.sourceforge.squirrel_sql.fw.util.log.ILogger;
+import net.sourceforge.squirrel_sql.fw.util.log.LoggerController;
+
+import java.sql.PreparedStatement;
+import java.sql.SQLException;
+/**
+ * This class will display the details for a MS SQL Server trigger.
+ *
+ * @author damluar
+ */
+public class TriggerDetailsTab extends BasePreparedStatementTab
+{
+ private static final StringManager s_stringMgr =
+ StringManagerFactory.getStringManager(TriggerDetailsTab.class);
+
+
+ /**
+ * This interface defines locale specific strings. This should be
+ * replaced with a property file.
+ */
+ private interface i18n
+ {
+ // i18n[TriggerDetailsTab.title=Details]
+ String TITLE = s_stringMgr.getString("TriggerDetailsTab.title");
+ // i18n[TriggerDetailsTab.hint=Display trigger details]
+ String HINT = s_stringMgr.getString("TriggerDetailsTab.hint");
+ }
+
+ /** SQL that retrieves the data. */
+ private static String SQL =
+ "SELECT tr.name AS [trigger], " +
+ " tb.name AS [table], " +
+ " sc.name AS [schema], " +
+ " tr.create_date AS [create date], " +
+ " tr.type_desc AS [type], " +
+ " CASE (select type_desc from sys.trigger_events WHERE sys.trigger_events.object_id = tr.object_id AND type = 1) " +
+ " WHEN 'INSERT' THEN 'Yes' ELSE 'No' " +
+ " END [insert event], " +
+ " CASE (select type_desc from sys.trigger_events WHERE sys.trigger_events.object_id = tr.object_id AND type = 2) " +
+ " WHEN 'UPDATE' THEN 'Yes' ELSE 'No' " +
+ " END [update event], " +
+ " CASE (select type_desc from sys.trigger_events WHERE sys.trigger_events.object_id = tr.object_id AND type = 3) " +
+ " WHEN 'DELETE' THEN 'Yes' ELSE 'No' " +
+ " END [delete event] " +
+ "FROM sys.schemas sc JOIN " +
+ " sys.tables tb ON sc.schema_id = tb.schema_id JOIN " +
+ " sys.triggers tr ON tb.object_id = tr.parent_id " +
+ "WHERE tr.name = ? " +
+ "AND sc.name = ?";
+
+ /** Logger for this class. */
+ private final static ILogger s_log =
+ LoggerController.createLogger(TriggerDetailsTab.class);
+
+ public TriggerDetailsTab()
+ {
+ super(i18n.TITLE, i18n.HINT, true);
+ }
+
+ protected PreparedStatement createStatement() throws SQLException
+ {
+ ISession session = getSession();
+ IDatabaseObjectInfo doi = getDatabaseObjectInfo();
+ if (s_log.isDebugEnabled()) {
+ s_log.debug("Trigger details SQL: "+SQL);
+ s_log.debug("Trigger name: "+doi.getSimpleName());
+ s_log.debug("Trigger schema: "+doi.getSchemaName());
+ }
+ PreparedStatement pstmt = session.getSQLConnection().prepareStatement(SQL);
+ pstmt.setString(1, doi.getSimpleName());
+ pstmt.setString(2, doi.getSchemaName());
+ return pstmt;
+ }
+}
Added: trunk/sql12/plugins/mssql/src/main/java/net/sourceforge/squirrel_sql/plugins/mssql/tab/TriggerSourceTab.java
===================================================================
--- trunk/sql12/plugins/mssql/src/main/java/net/sourceforge/squirrel_sql/plugins/mssql/tab/TriggerSourceTab.java (rev 0)
+++ trunk/sql12/plugins/mssql/src/main/java/net/sourceforge/squirrel_sql/plugins/mssql/tab/TriggerSourceTab.java 2011-06-05 20:34:58 UTC (rev 6295)
@@ -0,0 +1,64 @@
+package net.sourceforge.squirrel_sql.plugins.mssql.tab;
+
+/*
+ * Copyright (C) 2006 Rob Manning
+ * man...@us...
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+import net.sourceforge.squirrel_sql.client.session.ISession;
+import net.sourceforge.squirrel_sql.client.session.mainpanel.objecttree.tabs.BaseSourceTab;
+import net.sourceforge.squirrel_sql.fw.sql.IDatabaseObjectInfo;
+import net.sourceforge.squirrel_sql.fw.sql.ISQLConnection;
+import net.sourceforge.squirrel_sql.fw.util.log.ILogger;
+import net.sourceforge.squirrel_sql.fw.util.log.LoggerController;
+
+import java.sql.PreparedStatement;
+import java.sql.SQLException;
+
+/**
+ * This class will display the source for a MS SQL Server trigger.
+ *
+ * @author damluar
+ */
+public class TriggerSourceTab extends BaseSourceTab
+{
+ /** SQL that retrieves the source of a stored procedure. */
+ private static String SQL = "exec sp_helptext ?";
+
+ /** Logger for this class. */
+ private final static ILogger s_log = LoggerController.createLogger(TriggerSourceTab.class);
+
+ public TriggerSourceTab(String hint) {
+ super(hint);
+ }
+
+ protected PreparedStatement createStatement() throws SQLException
+ {
+ final ISession session = getSession();
+ final IDatabaseObjectInfo doi = getDatabaseObjectInfo();
+
+ if (s_log.isDebugEnabled())
+ {
+ s_log.debug("Running SQL: " + SQL);
+ s_log.debug("Trigger Name=" + doi.getSimpleName());
+ s_log.debug("Schema Name=" + doi.getSchemaName());
+ }
+ ISQLConnection conn = session.getSQLConnection();
+ PreparedStatement pstmt = conn.prepareStatement(SQL);
+ pstmt.setString(1, doi.getSchemaName() + '.' + doi.getSimpleName());
+ return pstmt;
+ }
+}
Modified: trunk/sql12/plugins/mssql/src/main/java/net/sourceforge/squirrel_sql/plugins/mssql/tab/ViewSourceTab.java
===================================================================
--- trunk/sql12/plugins/mssql/src/main/java/net/sourceforge/squirrel_sql/plugins/mssql/tab/ViewSourceTab.java 2011-06-05 19:45:51 UTC (rev 6294)
+++ trunk/sql12/plugins/mssql/src/main/java/net/sourceforge/squirrel_sql/plugins/mssql/tab/ViewSourceTab.java 2011-06-05 20:34:58 UTC (rev 6295)
@@ -17,15 +17,15 @@
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-import java.sql.PreparedStatement;
-import java.sql.SQLException;
-
import net.sourceforge.squirrel_sql.client.session.ISession;
import net.sourceforge.squirrel_sql.client.session.mainpanel.objecttree.tabs.BaseSourceTab;
import net.sourceforge.squirrel_sql.fw.sql.IDatabaseObjectInfo;
import net.sourceforge.squirrel_sql.fw.util.StringManager;
import net.sourceforge.squirrel_sql.fw.util.StringManagerFactory;
+import java.sql.PreparedStatement;
+import java.sql.SQLException;
+
/**
* This class will display the source for an MS-SQLServer view.
*
@@ -52,11 +52,13 @@
* query can return a result-set with multiple rows that should be concatenated. They should be correctly
* ordered by the SYSCOMMENT.COLID field.
*/
- private static final String BIGVIEW_SQL =
- "SELECT text FROM sysobjects o , syscomments c " +
- "where o.name = ? " +
- "and o.id = c.id " +
- "order by c.colid ";
+ private static final String BIGVIEW_SQL =
+ "SELECT text " +
+ "FROM sys.objects o " +
+ "INNER JOIN sys.schemas ON o.schema_id = sys.schemas.schema_id " +
+ "INNER JOIN syscomments c ON o.object_id = c.id " +
+ "WHERE sys.schemas.name = ? " +
+ "AND o.name = ?";
@@ -70,7 +72,8 @@
ISession session = getSession();
PreparedStatement pstmt = session.getSQLConnection().prepareStatement(BIGVIEW_SQL);
IDatabaseObjectInfo doi = getDatabaseObjectInfo();
- pstmt.setString(1, doi.getSimpleName());
+ pstmt.setString(1, doi.getSchemaName());
+ pstmt.setString(2, doi.getSimpleName());
return pstmt;
}
}
Modified: trunk/sql12/plugins/mssql/src/main/resources/net/sourceforge/squirrel_sql/plugins/mssql/tab/I18NStrings.properties
===================================================================
--- trunk/sql12/plugins/mssql/src/main/resources/net/sourceforge/squirrel_sql/plugins/mssql/tab/I18NStrings.properties 2011-06-05 19:45:51 UTC (rev 6294)
+++ trunk/sql12/plugins/mssql/src/main/resources/net/sourceforge/squirrel_sql/plugins/mssql/tab/I18NStrings.properties 2011-06-05 20:34:58 UTC (rev 6295)
@@ -1,2 +1,6 @@
ViewSourceTab.display=Show view source
+
+
+TriggerDetailsTab.title=Details
+TriggerDetailsTab.hint=Display trigger details
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ger...@us...> - 2011-06-07 19:40:30
|
Revision: 6298
http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=6298&view=rev
Author: gerdwagner
Date: 2011-06-07 19:40:23 +0000 (Tue, 07 Jun 2011)
Log Message:
-----------
Greenplum
Modified Paths:
--------------
trunk/sql12/installer/squirrelsql-installer-deps/pom.xml
trunk/sql12/installer/squirrelsql-macosx-installer/src/main/resources/izpack-mac.xml
trunk/sql12/installer/squirrelsql-macosx-installer/src/test/resources/auto-install.xml
trunk/sql12/installer/squirrelsql-other-installer/src/main/resources/izpack-other.xml
trunk/sql12/installer/squirrelsql-other-installer/src/test/resources/optional-auto-install.xml
trunk/sql12/plugins/pom.xml
Added Paths:
-----------
trunk/sql12/plugins/greenplum/pom.xml
Modified: trunk/sql12/installer/squirrelsql-installer-deps/pom.xml
===================================================================
--- trunk/sql12/installer/squirrelsql-installer-deps/pom.xml 2011-06-06 19:13:21 UTC (rev 6297)
+++ trunk/sql12/installer/squirrelsql-installer-deps/pom.xml 2011-06-07 19:40:23 UTC (rev 6298)
@@ -304,6 +304,13 @@
<type>zip</type>
</dependency>
<dependency>
+ <groupId>net.sf.squirrel-sql.plugins</groupId>
+ <artifactId>greenplum</artifactId>
+ <version>${project.version}</version>
+ <classifier>assembly</classifier>
+ <type>zip</type>
+ </dependency>
+ <dependency>
<groupId>net.sf.squirrel-sql.translations</groupId>
<artifactId>squirrelsql-translations</artifactId>
<version>${project.version}</version>
@@ -326,4 +333,4 @@
<version>${project.version}</version>
</dependency>
</dependencies>
-</project>
\ No newline at end of file
+</project>
Modified: trunk/sql12/installer/squirrelsql-macosx-installer/src/main/resources/izpack-mac.xml
===================================================================
--- trunk/sql12/installer/squirrelsql-macosx-installer/src/main/resources/izpack-mac.xml 2011-06-06 19:13:21 UTC (rev 6297)
+++ trunk/sql12/installer/squirrelsql-macosx-installer/src/main/resources/izpack-mac.xml 2011-06-07 19:40:23 UTC (rev 6298)
@@ -152,6 +152,14 @@
src="plugins/syntax.jar" />
</pack>
+ <pack required="no" preselected="no" installGroups="OptionalPlugins" name="Optional Plugin - Greenplum">
+ <description>
+ This plugin provides support for the Greenplum DB.
+ </description>
+ <file targetdir="$INSTALL_PATH/plugins" src="plugins/greenplum.jar" />
+ <file targetdir="$INSTALL_PATH/plugins" src="plugins/greenplum" />
+ </pack>
+
<pack required="no" preselected="no" installGroups="OptionalPlugins" name="Optional Plugin - WIKI table configurations">
<description>
This plugin provides you configurations for various WIKI tables.
@@ -159,7 +167,7 @@
<file targetdir="$INSTALL_PATH/plugins" src="plugins/wikiTableConfigurations.jar" />
<file targetdir="$INSTALL_PATH/plugins" src="plugins/wikiTableConfigurations" />
</pack>
-
+
<pack
required="no"
preselected="no"
@@ -484,4 +492,4 @@
<file targetdir="$INSTALL_PATH/Contents/Resources/Java/lib" src="translations/squirrel-sql_es.jar" />
</pack>
</packs>
-</installation>
\ No newline at end of file
+</installation>
Modified: trunk/sql12/installer/squirrelsql-macosx-installer/src/test/resources/auto-install.xml
===================================================================
--- trunk/sql12/installer/squirrelsql-macosx-installer/src/test/resources/auto-install.xml 2011-06-06 19:13:21 UTC (rev 6297)
+++ trunk/sql12/installer/squirrelsql-macosx-installer/src/test/resources/auto-install.xml 2011-06-07 19:40:23 UTC (rev 6298)
@@ -44,6 +44,7 @@
<pack index="35" name="Optional Translation - Russian" selected="true"/>
<pack index="36" name="Optional Translation - Spanish" selected="true"/>
<pack index="37" name="Optional Plugin - WIKI table configurations" selected="true"/>
+<pack index="38" name="Optional Plugin - Greenplum" selected="true"/>
</com.izforge.izpack.panels.PacksPanel>
<com.izforge.izpack.panels.InstallPanel id="UNKNOWN (com.izforge.izpack.panels.InstallPanel)"/>
<com.izforge.izpack.panels.FinishPanel id="UNKNOWN (com.izforge.izpack.panels.FinishPanel)"/>
Modified: trunk/sql12/installer/squirrelsql-other-installer/src/main/resources/izpack-other.xml
===================================================================
--- trunk/sql12/installer/squirrelsql-other-installer/src/main/resources/izpack-other.xml 2011-06-06 19:13:21 UTC (rev 6297)
+++ trunk/sql12/installer/squirrelsql-other-installer/src/main/resources/izpack-other.xml 2011-06-07 19:40:23 UTC (rev 6298)
@@ -112,6 +112,15 @@
<pack required="no" preselected="no" installGroups="OptionalPlugins"
+ name="Optional Plugin - Greenplum">
+ <description>
+ This plugin provides support for the Greenplum DB.
+ </description>
+ <file targetdir="$INSTALL_PATH/plugins" src="plugins/greenplum.jar" />
+ <file targetdir="$INSTALL_PATH/plugins" src="plugins/greenplum" />
+ </pack>
+
+ <pack required="no" preselected="no" installGroups="OptionalPlugins"
name="Optional Plugin - WIKI table configurations">
<description>
This plugin provides you configurations for various WIKI tables.
@@ -395,4 +404,4 @@
</pack>
</packs>
-</installation>
\ No newline at end of file
+</installation>
Modified: trunk/sql12/installer/squirrelsql-other-installer/src/test/resources/optional-auto-install.xml
===================================================================
--- trunk/sql12/installer/squirrelsql-other-installer/src/test/resources/optional-auto-install.xml 2011-06-06 19:13:21 UTC (rev 6297)
+++ trunk/sql12/installer/squirrelsql-other-installer/src/test/resources/optional-auto-install.xml 2011-06-07 19:40:23 UTC (rev 6298)
@@ -44,6 +44,7 @@
<pack index="35" name="Optional Translation - Russian" selected="true"/>
<pack index="36" name="Optional Translation - Spanish" selected="true"/>
<pack index="37" name="Optional Plugin - WIKI table configurations" selected="true"/>
+<pack index="38" name="Optional Plugin - Greenplum" selected="true"/>
</com.izforge.izpack.panels.PacksPanel>
<com.izforge.izpack.panels.InstallPanel id="UNKNOWN (com.izforge.izpack.panels.InstallPanel)"/>
<com.izforge.izpack.panels.ShortcutPanel id="UNKNOWN (com.izforge.izpack.panels.ShortcutPanel)"/>
Added: trunk/sql12/plugins/greenplum/pom.xml
===================================================================
--- trunk/sql12/plugins/greenplum/pom.xml (rev 0)
+++ trunk/sql12/plugins/greenplum/pom.xml 2011-06-07 19:40:23 UTC (rev 6298)
@@ -0,0 +1,114 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>net.sf.squirrel-sql.plugins</groupId>
+ <artifactId>squirrelsql-plugins-parent-pom</artifactId>
+ <version>3.3.0-SNAPSHOT</version>
+ <relativePath>../squirrelsql-plugins-parent-pom/pom.xml</relativePath>
+ </parent>
+ <artifactId>greenplum</artifactId>
+ <packaging>jar</packaging>
+ <name>Greenplum Plugin</name>
+ <description>Greenplum Plugin</description>
+ <inceptionYear>2001</inceptionYear>
+ <developers>
+ <developer>
+ <name>Gerd Wagner</name>
+ <roles>
+ <role>Administrator</role>
+ <role>Developer</role>
+ </roles>
+ </developer>
+ <developer>
+ <name>Adam Winn</name>
+ <roles>
+ <role>Developer</role>
+ <role>Release Manager</role>
+ </roles>
+ </developer>
+ </developers>
+ <licenses>
+ <license>
+ <name>GNU Lesser General Public License</name>
+ <url>http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt</url>
+ <distribution>repo</distribution>
+ </license>
+ </licenses>
+ <url>http://www.squirrelsql.org/</url>
+ <scm>
+ <connection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/trunk/sql12/plugins/greenplum</connection>
+ <developerConnection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/trunk/sql12/plugins/greenplum</developerConnection>
+ <url>http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/trunk/sql12/plugins/greenplum</url>
+ </scm>
+ <issueManagement>
+ <system>SourceForge Tracker</system>
+ <url>http://sourceforge.net/tracker/?group_id=28383%26atid=393414</url>
+ </issueManagement>
+ <ciManagement>
+ <system>Hudson</system>
+ <url>https://www.squirrel-sql.org/hudson/</url>
+ </ciManagement>
+ <dependencies>
+ <dependency>
+ <groupId>net.sf.squirrel-sql</groupId>
+ <artifactId>fw</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>net.sf.squirrel-sql</groupId>
+ <artifactId>squirrel-sql</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>net.sf.squirrel-sql</groupId>
+ <artifactId>squirrel-sql</artifactId>
+ <type>test-jar</type>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>gsbase</groupId>
+ <artifactId>gsbase</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.easymock</groupId>
+ <artifactId>easymock</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.easymock</groupId>
+ <artifactId>easymockclassextension</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.mockito</groupId>
+ <artifactId>mockito-all</artifactId>
+ </dependency>
+ </dependencies>
+ <properties>
+ <pluginClassName>net.sourceforge.squirrel_sql.plugins.greenplum.GreenplumPlugin</pluginClassName>
+ </properties>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-source-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-assembly-plugin</artifactId>
+ </plugin>
+ </plugins>
+ </build>
+</project>
\ No newline at end of file
Modified: trunk/sql12/plugins/pom.xml
===================================================================
--- trunk/sql12/plugins/pom.xml 2011-06-06 19:13:21 UTC (rev 6297)
+++ trunk/sql12/plugins/pom.xml 2011-06-07 19:40:23 UTC (rev 6298)
@@ -100,6 +100,7 @@
<module>syntax</module>
<module>userscript</module>
<module>wikiTableConfigurations</module>
+ <module>greenplum</module>
</modules>
</project>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ger...@us...> - 2011-06-12 19:50:13
|
Revision: 6305
http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=6305&view=rev
Author: gerdwagner
Date: 2011-06-12 19:50:06 +0000 (Sun, 12 Jun 2011)
Log Message:
-----------
Removed Netbeans and Ostermiller editors
Modified Paths:
--------------
trunk/sql12/doc/src/main/resources/changes.txt
trunk/sql12/installer/pom.xml
trunk/sql12/plugins/syntax/pom.xml
trunk/sql12/plugins/syntax/src/main/java/net/sourceforge/squirrel_sql/plugins/syntax/FindAction.java
trunk/sql12/plugins/syntax/src/main/java/net/sourceforge/squirrel_sql/plugins/syntax/FindSelectedAction.java
trunk/sql12/plugins/syntax/src/main/java/net/sourceforge/squirrel_sql/plugins/syntax/MarkSelectedAction.java
trunk/sql12/plugins/syntax/src/main/java/net/sourceforge/squirrel_sql/plugins/syntax/ReplaceAction.java
trunk/sql12/plugins/syntax/src/main/java/net/sourceforge/squirrel_sql/plugins/syntax/SQLEntryPanelFactoryProxy.java
trunk/sql12/plugins/syntax/src/main/java/net/sourceforge/squirrel_sql/plugins/syntax/SyntaxPlugin.java
trunk/sql12/plugins/syntax/src/main/java/net/sourceforge/squirrel_sql/plugins/syntax/SyntaxPreferences.java
trunk/sql12/plugins/syntax/src/main/java/net/sourceforge/squirrel_sql/plugins/syntax/SyntaxPreferencesPanel.java
trunk/sql12/plugins/syntax/src/main/java/net/sourceforge/squirrel_sql/plugins/syntax/ToolsPopupHandler.java
trunk/sql12/plugins/syntax/src/test/java/net/sourceforge/squirrel_sql/plugins/syntax/SyntaxPreferencesTest.java
Removed Paths:
-------------
trunk/sql12/plugins/syntax/src/main/java/net/sourceforge/squirrel_sql/plugins/syntax/netbeans/
trunk/sql12/plugins/syntax/src/main/java/net/sourceforge/squirrel_sql/plugins/syntax/oster/
trunk/sql12/plugins/syntax/src/main/resources/net/sourceforge/squirrel_sql/plugins/syntax/netbeans/
trunk/sql12/plugins/syntax/src/main/resources/org/
Modified: trunk/sql12/doc/src/main/resources/changes.txt
===================================================================
--- trunk/sql12/doc/src/main/resources/changes.txt 2011-06-12 19:13:05 UTC (rev 6304)
+++ trunk/sql12/doc/src/main/resources/changes.txt 2011-06-12 19:50:06 UTC (rev 6305)
@@ -7,6 +7,11 @@
Enhancements:
+Syntax Plugin:
+ Ostermiller and Netbeans editors were removed. Users that still used these editors are automatically
+ switched to the RSyntax editor.
+
+
MSSQL Plugin:
- Added display of triggers source code.
- If two views with same name in different schemas exist now the views' source code is
Modified: trunk/sql12/installer/pom.xml
===================================================================
--- trunk/sql12/installer/pom.xml 2011-06-12 19:13:05 UTC (rev 6304)
+++ trunk/sql12/installer/pom.xml 2011-06-12 19:50:06 UTC (rev 6305)
@@ -114,14 +114,14 @@
<includedArtifact>net.sourceforge.jexcelapi:jxl</includedArtifact>
<includedArtifact>log4j:log4j</includedArtifact>
<includedArtifact>be.cyberelf.nanoxml:nanoxml</includedArtifact>
- <includedArtifact>net.sf.squirrel-sql.thirdparty-non-maven:openide</includedArtifact>
- <includedArtifact>net.sf.squirrel-sql.thirdparty-non-maven:openide-loaders</includedArtifact>
- <includedArtifact>net.sf.squirrel-sql.thirdparty-non-maven:org-netbeans-modules-editor</includedArtifact>
- <includedArtifact>net.sf.squirrel-sql.thirdparty-non-maven:org-netbeans-modules-editor-fold</includedArtifact>
- <includedArtifact>net.sf.squirrel-sql.thirdparty-non-maven:org-netbeans-modules-editor-lib</includedArtifact>
- <includedArtifact>net.sf.squirrel-sql.thirdparty-non-maven:org-netbeans-modules-editor-util</includedArtifact>
- <includedArtifact>net.sf.squirrel-sql.thirdparty-non-maven:ostermiller-syntax</includedArtifact>
- <includedArtifact>net.sf.squirrel-sql.thirdparty-non-maven:ostermiller-bte</includedArtifact>
+ <!--<includedArtifact>net.sf.squirrel-sql.thirdparty-non-maven:openide</includedArtifact>-->
+ <!--<includedArtifact>net.sf.squirrel-sql.thirdparty-non-maven:openide-loaders</includedArtifact>-->
+ <!--<includedArtifact>net.sf.squirrel-sql.thirdparty-non-maven:org-netbeans-modules-editor</includedArtifact>-->
+ <!--<includedArtifact>net.sf.squirrel-sql.thirdparty-non-maven:org-netbeans-modules-editor-fold</includedArtifact>-->
+ <!--<includedArtifact>net.sf.squirrel-sql.thirdparty-non-maven:org-netbeans-modules-editor-lib</includedArtifact>-->
+ <!--<includedArtifact>net.sf.squirrel-sql.thirdparty-non-maven:org-netbeans-modules-editor-util</includedArtifact>-->
+ <!--<includedArtifact>net.sf.squirrel-sql.thirdparty-non-maven:ostermiller-syntax</includedArtifact>-->
+ <!--<includedArtifact>net.sf.squirrel-sql.thirdparty-non-maven:ostermiller-bte</includedArtifact>-->
<includedArtifact>com.fifesoft:rsyntaxtextarea</includedArtifact>
<includedArtifact>com.fifesoft.rtext:rtext</includedArtifact>
<includedArtifact>org.springframework:spring-beans</includedArtifact>
Modified: trunk/sql12/plugins/syntax/pom.xml
===================================================================
--- trunk/sql12/plugins/syntax/pom.xml 2011-06-12 19:13:05 UTC (rev 6304)
+++ trunk/sql12/plugins/syntax/pom.xml 2011-06-12 19:50:06 UTC (rev 6305)
@@ -104,41 +104,41 @@
<artifactId>rsyntaxtextarea</artifactId>
<version>r239</version>
</dependency>
- <dependency>
- <groupId>net.sf.squirrel-sql.thirdparty-non-maven</groupId>
- <artifactId>openide</artifactId>
- <version>4.0</version>
- </dependency>
- <dependency>
- <groupId>net.sf.squirrel-sql.thirdparty-non-maven</groupId>
- <artifactId>openide-loaders</artifactId>
- <version>4.0</version>
- </dependency>
- <dependency>
- <groupId>net.sf.squirrel-sql.thirdparty-non-maven</groupId>
- <artifactId>org-netbeans-modules-editor</artifactId>
- <version>4.0</version>
- </dependency>
- <dependency>
- <groupId>net.sf.squirrel-sql.thirdparty-non-maven</groupId>
- <artifactId>org-netbeans-modules-editor-fold</artifactId>
- <version>4.0</version>
- </dependency>
- <dependency>
- <groupId>net.sf.squirrel-sql.thirdparty-non-maven</groupId>
- <artifactId>org-netbeans-modules-editor-lib</artifactId>
- <version>4.0</version>
- </dependency>
- <dependency>
- <groupId>net.sf.squirrel-sql.thirdparty-non-maven</groupId>
- <artifactId>org-netbeans-modules-editor-util</artifactId>
- <version>4.0</version>
- </dependency>
- <dependency>
- <groupId>net.sf.squirrel-sql.thirdparty-non-maven</groupId>
- <artifactId>ostermiller-syntax</artifactId>
- <version>1.1.1</version>
- </dependency>
+ <!--<dependency>-->
+ <!--<groupId>net.sf.squirrel-sql.thirdparty-non-maven</groupId>-->
+ <!--<artifactId>openide</artifactId>-->
+ <!--<version>4.0</version>-->
+ <!--</dependency>-->
+ <!--<dependency>-->
+ <!--<groupId>net.sf.squirrel-sql.thirdparty-non-maven</groupId>-->
+ <!--<artifactId>openide-loaders</artifactId>-->
+ <!--<version>4.0</version>-->
+ <!--</dependency>-->
+ <!--<dependency>-->
+ <!--<groupId>net.sf.squirrel-sql.thirdparty-non-maven</groupId>-->
+ <!--<artifactId>org-netbeans-modules-editor</artifactId>-->
+ <!--<version>4.0</version>-->
+ <!--</dependency>-->
+ <!--<dependency>-->
+ <!--<groupId>net.sf.squirrel-sql.thirdparty-non-maven</groupId>-->
+ <!--<artifactId>org-netbeans-modules-editor-fold</artifactId>-->
+ <!--<version>4.0</version>-->
+ <!--</dependency>-->
+ <!--<dependency>-->
+ <!--<groupId>net.sf.squirrel-sql.thirdparty-non-maven</groupId>-->
+ <!--<artifactId>org-netbeans-modules-editor-lib</artifactId>-->
+ <!--<version>4.0</version>-->
+ <!--</dependency>-->
+ <!--<dependency>-->
+ <!--<groupId>net.sf.squirrel-sql.thirdparty-non-maven</groupId>-->
+ <!--<artifactId>org-netbeans-modules-editor-util</artifactId>-->
+ <!--<version>4.0</version>-->
+ <!--</dependency>-->
+ <!--<dependency>-->
+ <!--<groupId>net.sf.squirrel-sql.thirdparty-non-maven</groupId>-->
+ <!--<artifactId>ostermiller-syntax</artifactId>-->
+ <!--<version>1.1.1</version>-->
+ <!--</dependency>-->
</dependencies>
<properties>
<pluginClassName>net.sourceforge.squirrel_sql.plugins.syntax.SyntaxPlugin</pluginClassName>
Modified: trunk/sql12/plugins/syntax/src/main/java/net/sourceforge/squirrel_sql/plugins/syntax/FindAction.java
===================================================================
--- trunk/sql12/plugins/syntax/src/main/java/net/sourceforge/squirrel_sql/plugins/syntax/FindAction.java 2011-06-12 19:13:05 UTC (rev 6304)
+++ trunk/sql12/plugins/syntax/src/main/java/net/sourceforge/squirrel_sql/plugins/syntax/FindAction.java 2011-06-12 19:50:06 UTC (rev 6305)
@@ -2,16 +2,14 @@
import net.sourceforge.squirrel_sql.client.IApplication;
import net.sourceforge.squirrel_sql.client.action.SquirrelAction;
-import net.sourceforge.squirrel_sql.client.session.ISession;
import net.sourceforge.squirrel_sql.client.session.ISQLEntryPanel;
import net.sourceforge.squirrel_sql.client.session.ISQLPanelAPI;
+import net.sourceforge.squirrel_sql.client.session.ISession;
import net.sourceforge.squirrel_sql.client.session.action.ISQLPanelAction;
-import net.sourceforge.squirrel_sql.plugins.syntax.SyntaxPluginResources;
-import net.sourceforge.squirrel_sql.plugins.syntax.rsyntax.SquirrelRSyntaxTextArea;
-import net.sourceforge.squirrel_sql.plugins.syntax.rsyntax.RSyntaxSQLEntryPanel;
-import net.sourceforge.squirrel_sql.plugins.syntax.netbeans.NetbeansSQLEntryPanel;
import net.sourceforge.squirrel_sql.fw.util.StringManager;
import net.sourceforge.squirrel_sql.fw.util.StringManagerFactory;
+import net.sourceforge.squirrel_sql.plugins.syntax.rsyntax.RSyntaxSQLEntryPanel;
+import net.sourceforge.squirrel_sql.plugins.syntax.rsyntax.SquirrelRSyntaxTextArea;
import javax.swing.*;
import java.awt.event.ActionEvent;
@@ -54,13 +52,8 @@
private void doActionPerformed(ISQLEntryPanel sqlEntryPanel, ActionEvent evt)
{
- if(sqlEntryPanel instanceof NetbeansSQLEntryPanel)
+ if(sqlEntryPanel instanceof RSyntaxSQLEntryPanel)
{
- NetbeansSQLEntryPanel nsep = (NetbeansSQLEntryPanel) sqlEntryPanel;
- nsep.showFindDialog(evt);
- }
- else if(sqlEntryPanel instanceof RSyntaxSQLEntryPanel)
- {
SquirrelRSyntaxTextArea rsep = (SquirrelRSyntaxTextArea) sqlEntryPanel.getTextComponent();
rsep.showFindDialog(evt);
}
Modified: trunk/sql12/plugins/syntax/src/main/java/net/sourceforge/squirrel_sql/plugins/syntax/FindSelectedAction.java
===================================================================
--- trunk/sql12/plugins/syntax/src/main/java/net/sourceforge/squirrel_sql/plugins/syntax/FindSelectedAction.java 2011-06-12 19:13:05 UTC (rev 6304)
+++ trunk/sql12/plugins/syntax/src/main/java/net/sourceforge/squirrel_sql/plugins/syntax/FindSelectedAction.java 2011-06-12 19:50:06 UTC (rev 6305)
@@ -2,16 +2,14 @@
import net.sourceforge.squirrel_sql.client.IApplication;
import net.sourceforge.squirrel_sql.client.action.SquirrelAction;
-import net.sourceforge.squirrel_sql.client.session.ISession;
import net.sourceforge.squirrel_sql.client.session.ISQLEntryPanel;
import net.sourceforge.squirrel_sql.client.session.ISQLPanelAPI;
+import net.sourceforge.squirrel_sql.client.session.ISession;
import net.sourceforge.squirrel_sql.client.session.action.ISQLPanelAction;
-import net.sourceforge.squirrel_sql.plugins.syntax.SyntaxPluginResources;
-import net.sourceforge.squirrel_sql.plugins.syntax.rsyntax.SquirrelRSyntaxTextArea;
-import net.sourceforge.squirrel_sql.plugins.syntax.rsyntax.RSyntaxSQLEntryPanel;
-import net.sourceforge.squirrel_sql.plugins.syntax.netbeans.NetbeansSQLEntryPanel;
import net.sourceforge.squirrel_sql.fw.util.StringManager;
import net.sourceforge.squirrel_sql.fw.util.StringManagerFactory;
+import net.sourceforge.squirrel_sql.plugins.syntax.rsyntax.RSyntaxSQLEntryPanel;
+import net.sourceforge.squirrel_sql.plugins.syntax.rsyntax.SquirrelRSyntaxTextArea;
import javax.swing.*;
import java.awt.event.ActionEvent;
Modified: trunk/sql12/plugins/syntax/src/main/java/net/sourceforge/squirrel_sql/plugins/syntax/MarkSelectedAction.java
===================================================================
--- trunk/sql12/plugins/syntax/src/main/java/net/sourceforge/squirrel_sql/plugins/syntax/MarkSelectedAction.java 2011-06-12 19:13:05 UTC (rev 6304)
+++ trunk/sql12/plugins/syntax/src/main/java/net/sourceforge/squirrel_sql/plugins/syntax/MarkSelectedAction.java 2011-06-12 19:50:06 UTC (rev 6305)
@@ -2,16 +2,14 @@
import net.sourceforge.squirrel_sql.client.IApplication;
import net.sourceforge.squirrel_sql.client.action.SquirrelAction;
-import net.sourceforge.squirrel_sql.client.session.ISession;
import net.sourceforge.squirrel_sql.client.session.ISQLEntryPanel;
import net.sourceforge.squirrel_sql.client.session.ISQLPanelAPI;
+import net.sourceforge.squirrel_sql.client.session.ISession;
import net.sourceforge.squirrel_sql.client.session.action.ISQLPanelAction;
-import net.sourceforge.squirrel_sql.plugins.syntax.SyntaxPluginResources;
-import net.sourceforge.squirrel_sql.plugins.syntax.rsyntax.SquirrelRSyntaxTextArea;
-import net.sourceforge.squirrel_sql.plugins.syntax.rsyntax.RSyntaxSQLEntryPanel;
-import net.sourceforge.squirrel_sql.plugins.syntax.netbeans.NetbeansSQLEntryPanel;
import net.sourceforge.squirrel_sql.fw.util.StringManager;
import net.sourceforge.squirrel_sql.fw.util.StringManagerFactory;
+import net.sourceforge.squirrel_sql.plugins.syntax.rsyntax.RSyntaxSQLEntryPanel;
+import net.sourceforge.squirrel_sql.plugins.syntax.rsyntax.SquirrelRSyntaxTextArea;
import javax.swing.*;
import java.awt.event.ActionEvent;
Modified: trunk/sql12/plugins/syntax/src/main/java/net/sourceforge/squirrel_sql/plugins/syntax/ReplaceAction.java
===================================================================
--- trunk/sql12/plugins/syntax/src/main/java/net/sourceforge/squirrel_sql/plugins/syntax/ReplaceAction.java 2011-06-12 19:13:05 UTC (rev 6304)
+++ trunk/sql12/plugins/syntax/src/main/java/net/sourceforge/squirrel_sql/plugins/syntax/ReplaceAction.java 2011-06-12 19:50:06 UTC (rev 6305)
@@ -2,16 +2,14 @@
import net.sourceforge.squirrel_sql.client.IApplication;
import net.sourceforge.squirrel_sql.client.action.SquirrelAction;
-import net.sourceforge.squirrel_sql.client.session.ISession;
import net.sourceforge.squirrel_sql.client.session.ISQLEntryPanel;
import net.sourceforge.squirrel_sql.client.session.ISQLPanelAPI;
+import net.sourceforge.squirrel_sql.client.session.ISession;
import net.sourceforge.squirrel_sql.client.session.action.ISQLPanelAction;
-import net.sourceforge.squirrel_sql.plugins.syntax.SyntaxPluginResources;
-import net.sourceforge.squirrel_sql.plugins.syntax.rsyntax.RSyntaxSQLEntryPanel;
-import net.sourceforge.squirrel_sql.plugins.syntax.rsyntax.SquirrelRSyntaxTextArea;
-import net.sourceforge.squirrel_sql.plugins.syntax.netbeans.NetbeansSQLEntryPanel;
import net.sourceforge.squirrel_sql.fw.util.StringManager;
import net.sourceforge.squirrel_sql.fw.util.StringManagerFactory;
+import net.sourceforge.squirrel_sql.plugins.syntax.rsyntax.RSyntaxSQLEntryPanel;
+import net.sourceforge.squirrel_sql.plugins.syntax.rsyntax.SquirrelRSyntaxTextArea;
import javax.swing.*;
import java.awt.event.ActionEvent;
@@ -51,13 +49,8 @@
private void doActionPerformed(ISQLEntryPanel sqlEntryPanel, ActionEvent evt)
{
- if(sqlEntryPanel instanceof NetbeansSQLEntryPanel)
+ if(sqlEntryPanel instanceof RSyntaxSQLEntryPanel)
{
- NetbeansSQLEntryPanel nsep = (NetbeansSQLEntryPanel) sqlEntryPanel;
- nsep.showReplaceDialog(evt);
- }
- else if(sqlEntryPanel instanceof RSyntaxSQLEntryPanel)
- {
SquirrelRSyntaxTextArea rsep = (SquirrelRSyntaxTextArea) sqlEntryPanel.getTextComponent();
rsep.showReplaceDialog(evt);
}
Modified: trunk/sql12/plugins/syntax/src/main/java/net/sourceforge/squirrel_sql/plugins/syntax/SQLEntryPanelFactoryProxy.java
===================================================================
--- trunk/sql12/plugins/syntax/src/main/java/net/sourceforge/squirrel_sql/plugins/syntax/SQLEntryPanelFactoryProxy.java 2011-06-12 19:13:05 UTC (rev 6304)
+++ trunk/sql12/plugins/syntax/src/main/java/net/sourceforge/squirrel_sql/plugins/syntax/SQLEntryPanelFactoryProxy.java 2011-06-12 19:50:06 UTC (rev 6305)
@@ -1,27 +1,21 @@
package net.sourceforge.squirrel_sql.plugins.syntax;
-import java.util.HashMap;
-
-import javax.swing.SwingUtilities;
-
import net.sourceforge.squirrel_sql.client.session.ISQLEntryPanel;
import net.sourceforge.squirrel_sql.client.session.ISQLEntryPanelFactory;
import net.sourceforge.squirrel_sql.client.session.ISession;
import net.sourceforge.squirrel_sql.fw.util.StringManager;
import net.sourceforge.squirrel_sql.fw.util.StringManagerFactory;
-import net.sourceforge.squirrel_sql.plugins.syntax.netbeans.NetbeansSQLEntryAreaFactory;
-import net.sourceforge.squirrel_sql.plugins.syntax.oster.OsterSQLEntryAreaFactory;
import net.sourceforge.squirrel_sql.plugins.syntax.rsyntax.RSyntaxSQLEntryAreaFactory;
+import java.util.HashMap;
+
public class SQLEntryPanelFactoryProxy implements ISQLEntryPanelFactory
{
private static final StringManager s_stringMgr =
StringManagerFactory.getStringManager(SQLEntryPanelFactoryProxy.class);
- private NetbeansSQLEntryAreaFactory _netbeansFactory;
- private OsterSQLEntryAreaFactory _osterFactory;
private SyntaxPlugin _syntaxPugin;
/** The original Squirrel SQL CLient factory for creating SQL entry panels. */
@@ -34,14 +28,11 @@
{
_originalFactory = originalFactory;
_rsyntaxFactory = new RSyntaxSQLEntryAreaFactory(syntaxPugin);
- _netbeansFactory = new NetbeansSQLEntryAreaFactory(syntaxPugin);
- _osterFactory = new OsterSQLEntryAreaFactory(syntaxPugin);
_syntaxPugin = syntaxPugin;
}
public void sessionEnding(ISession session)
{
- _netbeansFactory.sessionEnding(session);
_rsyntaxFactory.sessionEnding(session);
}
@@ -63,24 +54,6 @@
{
newPnl = _rsyntaxFactory.createSQLEntryPanel(session, props);
}
- else if (prefs.getUseNetbeansTextControl())
- {
- newPnl = _netbeansFactory.createSQLEntryPanel(session, props);
- }
- else if (prefs.getUseOsterTextControl())
- {
- SwingUtilities.invokeLater(new Runnable()
- {
- public void run()
- {
- session.showMessage(
- // i18n[syntax.osterWarning=You are using the Oster editor. Please consider using the Netbeans editor. See menu File --> New Session Properties --> Syntax]
- s_stringMgr.getString("syntax.osterWarning"));
- }
- });
-
- newPnl = _osterFactory.createSQLEntryPanel(session);
- }
else
{
newPnl = _originalFactory.createSQLEntryPanel(session, props);
Modified: trunk/sql12/plugins/syntax/src/main/java/net/sourceforge/squirrel_sql/plugins/syntax/SyntaxPlugin.java
===================================================================
--- trunk/sql12/plugins/syntax/src/main/java/net/sourceforge/squirrel_sql/plugins/syntax/SyntaxPlugin.java 2011-06-12 19:13:05 UTC (rev 6304)
+++ trunk/sql12/plugins/syntax/src/main/java/net/sourceforge/squirrel_sql/plugins/syntax/SyntaxPlugin.java 2011-06-12 19:50:06 UTC (rev 6305)
@@ -19,19 +19,6 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
-import java.beans.PropertyChangeEvent;
-import java.beans.PropertyChangeListener;
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Map;
-
-import javax.swing.Action;
-import javax.swing.JMenu;
-import javax.swing.JMenuItem;
-import javax.swing.JOptionPane;
-
import net.sourceforge.squirrel_sql.client.IApplication;
import net.sourceforge.squirrel_sql.client.action.ActionCollection;
import net.sourceforge.squirrel_sql.client.gui.session.ObjectTreeInternalFrame;
@@ -53,11 +40,18 @@
import net.sourceforge.squirrel_sql.fw.util.log.LoggerController;
import net.sourceforge.squirrel_sql.fw.xml.XMLBeanReader;
import net.sourceforge.squirrel_sql.fw.xml.XMLBeanWriter;
-import net.sourceforge.squirrel_sql.plugins.syntax.netbeans.NetbeansSQLEntryPanel;
-import net.sourceforge.squirrel_sql.plugins.syntax.oster.OsterSQLEntryPanel;
import net.sourceforge.squirrel_sql.plugins.syntax.rsyntax.RSyntaxSQLEntryPanel;
import net.sourceforge.squirrel_sql.plugins.syntax.rsyntax.action.SquirrelCopyAsRtfAction;
+import javax.swing.*;
+import java.beans.PropertyChangeEvent;
+import java.beans.PropertyChangeListener;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Map;
+
/**
* The Ostermiller plugin class. This plugin adds syntax highlighting to the SQL entry area.
*
@@ -543,9 +537,7 @@
{
String propName = evt.getPropertyName();
- if (false == SyntaxPreferences.IPropertyNames.USE_NETBEANS_CONTROL.equals(propName)
- && false == SyntaxPreferences.IPropertyNames.USE_OSTER_CONTROL.equals(propName)
- && false == SyntaxPreferences.IPropertyNames.USE_RSYNTAX_CONTROL.equals(propName))
+ if (false == SyntaxPreferences.IPropertyNames.USE_RSYNTAX_CONTROL.equals(propName))
{
// Not the Textcontrol itself changed but some other of the Syntax Preferences, for example a
@@ -554,16 +546,7 @@
Object pluginObject =
_session.getPluginObject(_plugin, IConstants.ISessionKeys.SQL_ENTRY_CONTROL);
- if (pluginObject instanceof NetbeansSQLEntryPanel)
- {
- ((NetbeansSQLEntryPanel) pluginObject).updateFromPreferences();
- }
- if (pluginObject instanceof OsterSQLEntryPanel)
- {
- ((OsterSQLEntryPanel) pluginObject).updateFromPreferences();
- }
-
if (pluginObject instanceof RSyntaxSQLEntryPanel)
{
((RSyntaxSQLEntryPanel) pluginObject).updateFromPreferences();
Modified: trunk/sql12/plugins/syntax/src/main/java/net/sourceforge/squirrel_sql/plugins/syntax/SyntaxPreferences.java
===================================================================
--- trunk/sql12/plugins/syntax/src/main/java/net/sourceforge/squirrel_sql/plugins/syntax/SyntaxPreferences.java 2011-06-12 19:13:05 UTC (rev 6304)
+++ trunk/sql12/plugins/syntax/src/main/java/net/sourceforge/squirrel_sql/plugins/syntax/SyntaxPreferences.java 2011-06-12 19:50:06 UTC (rev 6305)
@@ -30,9 +30,6 @@
*/
public class SyntaxPreferences implements Serializable, Cloneable
{
- private static final long serialVersionUID = 1L;
-
-
public interface IPropertyNames {
// String BLINK_CARET = "blinkCaret";
// String BLOCK_CARET_ENABLED = "blockCaretEnabled";
@@ -57,8 +54,6 @@
// String SELECTION_COLOR = "selectionColor";
// String SHOW_LINE_NBRS = "showLineNumbers";
String TABLE_STYLE = "tableStyle";
- String USE_OSTER_CONTROL = "useOsterControl";
- String USE_NETBEANS_CONTROL = "useNetbeansControl";
String USE_RSYNTAX_CONTROL = "useRSyntaxControl";
String USE_PLAIN_CONTROL = "usePlainControl";
String WHITE_SPACE_STYLE = "whiteSpaceStyle";
@@ -71,9 +66,6 @@
/** Object to handle property change events. */
private transient PropertyChangeReporter _propChgReporter;
- /** If <TT>true</TT> use the Oster text control else use the standard Java control. */
- private boolean _useOsterTextControl = false;
- private boolean _useNetbeansTextControl = false;
private boolean _usePlainTextControl = false;
private boolean _useRSyntaxTextArea = true;
@@ -241,32 +233,30 @@
getPropertyChangeReporter().removePropertyChangeListener(listener);
}
- public boolean getUseOsterTextControl()
- {
- return _useOsterTextControl;
- }
+ /**
+ * @deprecated Oster editor has been removed. This is just here to automatically switch
+ * users of the Oster editor to RSyntax
+ */
public void setUseOsterTextControl(boolean data)
{
- if (_useOsterTextControl != data)
- {
- getPropertyChangeReporter().firePropertyChange(IPropertyNames.USE_OSTER_CONTROL, _useOsterTextControl, data);
- _useOsterTextControl = data;
+ if(data)
+ {
+ setUseRSyntaxTextArea(true);
}
}
- public boolean getUseNetbeansTextControl()
- {
- return _useNetbeansTextControl;
- }
+ /**
+ * @deprecated Netbeans editor has been removed. This is just here to automatically switch
+ * users of the Netbeans editor to RSyntax
+ */
public void setUseNetbeansTextControl(boolean data)
{
- if (_useNetbeansTextControl != data)
+ if(data)
{
- getPropertyChangeReporter().firePropertyChange(IPropertyNames.USE_NETBEANS_CONTROL, _useNetbeansTextControl, data);
- _useNetbeansTextControl = data;
+ setUseRSyntaxTextArea(true);
}
}
Modified: trunk/sql12/plugins/syntax/src/main/java/net/sourceforge/squirrel_sql/plugins/syntax/SyntaxPreferencesPanel.java
===================================================================
--- trunk/sql12/plugins/syntax/src/main/java/net/sourceforge/squirrel_sql/plugins/syntax/SyntaxPreferencesPanel.java 2011-06-12 19:13:05 UTC (rev 6304)
+++ trunk/sql12/plugins/syntax/src/main/java/net/sourceforge/squirrel_sql/plugins/syntax/SyntaxPreferencesPanel.java 2011-06-12 19:50:06 UTC (rev 6305)
@@ -196,9 +196,7 @@
}
- private final JRadioButton _netbeansActiveOpt = new JRadioButton(i18n.NETBEANS);
private final JRadioButton _rsyntaxActiveOpt = new JRadioButton(i18n.RSYNTAX);
- private final JRadioButton _osterActiveOpt = new JRadioButton(i18n.OSTER);
private final JRadioButton _plainActiveOpt = new JRadioButton(i18n.PLAIN);
private final JCheckBox _chkTextLimitLineVisible = new JCheckBox(i18n.TEXT_LIMIT_LINE_VISIBLE);
@@ -251,8 +249,6 @@
void loadData(SyntaxPreferences prefs)
{
- _osterActiveOpt.setSelected(prefs.getUseOsterTextControl());
- _netbeansActiveOpt.setSelected(prefs.getUseNetbeansTextControl());
_rsyntaxActiveOpt.setSelected(prefs.getUseRSyntaxTextArea());
_plainActiveOpt.setSelected(prefs.getUsePlainTextControl());
@@ -275,22 +271,16 @@
void applyChanges(SyntaxPreferences prefs)
{
boolean oldUseRSyntaxTextArea = prefs.getUseRSyntaxTextArea();
- boolean oldUseNetbeansTextControl = prefs.getUseNetbeansTextControl();
- boolean oldUseOsterTextControl = prefs.getUseOsterTextControl();
boolean oldUsePlainTextControl = prefs.getUsePlainTextControl();
try
{
- prefs.setUseNetbeansTextControl(_netbeansActiveOpt.isSelected());
prefs.setUseRSyntaxTextArea(_rsyntaxActiveOpt.isSelected());
- prefs.setUseOsterTextControl(_osterActiveOpt.isSelected());
prefs.setUsePlainTextControl(_plainActiveOpt.isSelected());
}
catch (SyntaxPrefChangeNotSupportedException e)
{
- prefs.setUseNetbeansTextControl(oldUseNetbeansTextControl);
prefs.setUseRSyntaxTextArea(oldUseRSyntaxTextArea);
- prefs.setUseOsterTextControl(oldUseOsterTextControl);
prefs.setUsePlainTextControl(oldUsePlainTextControl);
}
@@ -337,18 +327,16 @@
private void updateControlStatus()
{
- final boolean useOsterControl = _osterActiveOpt.isSelected();
- final boolean useNetbeansControl = _netbeansActiveOpt.isSelected();
final boolean useRSyntaxControl = _rsyntaxActiveOpt.isSelected();
final boolean usePlainControl = _plainActiveOpt.isSelected();
- _stylesList.setEnabled(useOsterControl || useNetbeansControl || useRSyntaxControl);
- _styleMaintPnl.setEnabled(useOsterControl || useNetbeansControl || useRSyntaxControl);
+ _stylesList.setEnabled(useRSyntaxControl);
+ _styleMaintPnl.setEnabled(useRSyntaxControl);
- _chkTextLimitLineVisible.setEnabled(useNetbeansControl || useRSyntaxControl);
- _txtTextLimitLineWidth.setEnabled(useNetbeansControl || useRSyntaxControl);
+ _chkTextLimitLineVisible.setEnabled(useRSyntaxControl);
+ _txtTextLimitLineWidth.setEnabled(useRSyntaxControl);
- if(useNetbeansControl || useRSyntaxControl)
+ if(useRSyntaxControl)
{
_txtTextLimitLineWidth.setEnabled(_chkTextLimitLineVisible.isSelected());
}
@@ -366,26 +354,9 @@
ButtonGroup bg = new ButtonGroup();
bg.add(_rsyntaxActiveOpt);
- bg.add(_netbeansActiveOpt);
- bg.add(_osterActiveOpt);
bg.add(_plainActiveOpt);
- _osterActiveOpt.addChangeListener(new ChangeListener()
- {
- public void stateChanged(ChangeEvent evt)
- {
- updateControlStatus();
- }
- });
- _netbeansActiveOpt.addChangeListener(new ChangeListener()
- {
- public void stateChanged(ChangeEvent evt)
- {
- updateControlStatus();
- }
- });
-
_rsyntaxActiveOpt.addChangeListener(new ChangeListener()
{
public void stateChanged(ChangeEvent evt)
@@ -466,25 +437,19 @@
pnlRet.add(_rsyntaxActiveOpt, gbc);
gbc = new GridBagConstraints(0,1,1,1,0,0,GridBagConstraints.NORTHWEST, GridBagConstraints.NONE, new Insets(0,5,5,5), 0,0);
- pnlRet.add(_netbeansActiveOpt, gbc);
-
- gbc = new GridBagConstraints(0,2,1,1,0,0,GridBagConstraints.NORTHWEST, GridBagConstraints.NONE, new Insets(0,5,5,5), 0,0);
- pnlRet.add(_osterActiveOpt, gbc);
-
- gbc = new GridBagConstraints(0,3,1,1,0,0,GridBagConstraints.NORTHWEST, GridBagConstraints.NONE, new Insets(0,5,5,5), 0,0);
pnlRet.add(_plainActiveOpt, gbc);
- gbc = new GridBagConstraints(0,4,1,1,0,0,GridBagConstraints.NORTHWEST, GridBagConstraints.NONE, new Insets(40,5,0,5), 0,0);
+ gbc = new GridBagConstraints(0,2,1,1,0,0,GridBagConstraints.NORTHWEST, GridBagConstraints.NONE, new Insets(40,5,0,5), 0,0);
pnlRet.add(createPnlLineLimit(), gbc);
- gbc = new GridBagConstraints(0,5,1,1,0,0,GridBagConstraints.WEST,...
[truncated message content] |
|
From: <man...@us...> - 2011-07-23 00:15:20
|
Revision: 6315
http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=6315&view=rev
Author: manningr
Date: 2011-07-23 00:15:14 +0000 (Sat, 23 Jul 2011)
Log Message:
-----------
Bug 3172465: (Error connecting to DB after 3.2.1 upgrade) A couple more missing dependencies that prevented the SQL Validator from connecting to the mimer site.
Modified Paths:
--------------
trunk/sql12/installer/pom.xml
trunk/sql12/plugins/sqlval/pom.xml
Modified: trunk/sql12/installer/pom.xml
===================================================================
--- trunk/sql12/installer/pom.xml 2011-07-17 00:31:32 UTC (rev 6314)
+++ trunk/sql12/installer/pom.xml 2011-07-23 00:15:14 UTC (rev 6315)
@@ -102,6 +102,7 @@
<includedArtifact>commons-cli:commons-cli</includedArtifact>
<includedArtifact>commons-codec:commons-codec</includedArtifact>
<includedArtifact>commons-collections:commons-collections</includedArtifact>
+ <includedArtifact>commons-discovery:commons-discovery</includedArtifact>
<includedArtifact>commons-httpclient:commons-httpclient</includedArtifact>
<includedArtifact>commons-lang:commons-lang</includedArtifact>
<includedArtifact>commons-logging:commons-logging</includedArtifact>
Modified: trunk/sql12/plugins/sqlval/pom.xml
===================================================================
--- trunk/sql12/plugins/sqlval/pom.xml 2011-07-17 00:31:32 UTC (rev 6314)
+++ trunk/sql12/plugins/sqlval/pom.xml 2011-07-23 00:15:14 UTC (rev 6315)
@@ -1,4 +1,5 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>net.sf.squirrel-sql.plugins</groupId>
@@ -109,6 +110,12 @@
<artifactId>axis-wsdl4j</artifactId>
<version>1.2</version>
</dependency>
+ <dependency>
+ <groupId>commons-discovery</groupId>
+ <artifactId>commons-discovery</artifactId>
+ <version>0.2</version>
+ <scope>compile</scope>
+ </dependency>
</dependencies>
<properties>
<pluginClassName>net.sourceforge.squirrel_sql.plugins.sqlval.SQLValidatorPlugin</pluginClassName>
@@ -118,7 +125,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
- </plugin>
+ </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <man...@us...> - 2011-07-30 13:56:06
|
Revision: 6330
http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=6330&view=rev
Author: manningr
Date: 2011-07-30 13:55:59 +0000 (Sat, 30 Jul 2011)
Log Message:
-----------
New CLI project to build a jar that can be used to run DBCopy from the command-line.
Added Paths:
-----------
trunk/sql12/cli/
trunk/sql12/cli/dbcopy/
trunk/sql12/cli/dbcopy/pom.xml
Property changes on: trunk/sql12/cli/dbcopy
___________________________________________________________________
Added: svn:ignore
+ target
Added: trunk/sql12/cli/dbcopy/pom.xml
===================================================================
--- trunk/sql12/cli/dbcopy/pom.xml (rev 0)
+++ trunk/sql12/cli/dbcopy/pom.xml 2011-07-30 13:55:59 UTC (rev 6330)
@@ -0,0 +1,115 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>net.sf.squirrel-sql</groupId>
+ <artifactId>squirrel-root-pom</artifactId>
+ <version>3.3.0-SNAPSHOT</version>
+ </parent>
+ <groupId>net.sf.squirrel-sql.cli</groupId>
+ <artifactId>dbcopy-cli</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ <packaging>jar</packaging>
+ <name>DBCopy Command-Line Interface</name>
+ <description>
+ Project that builds a super-jar whose main class is the DBCopy command-line interface.
+ </description>
+ <inceptionYear>2001</inceptionYear>
+ <developers>
+ <developer>
+ <name>Gerd Wagner</name>
+ <roles>
+ <role>Administrator</role>
+ <role>Developer</role>
+ </roles>
+ </developer>
+ <developer>
+ <name>Rob Manning</name>
+ <roles>
+ <role>Developer</role>
+ <role>Release Manager</role>
+ </roles>
+ </developer>
+ </developers>
+ <licenses>
+ <license>
+ <name>GNU Lesser General Public License</name>
+ <url>http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt</url>
+ <distribution>repo</distribution>
+ </license>
+ </licenses>
+ <url>http://www.squirrelsql.org/</url>
+ <scm>
+ <connection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/trunk/sql12/plugins/dbcopy</connection>
+ <developerConnection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/trunk/sql12/plugins/dbcopy</developerConnection>
+ <url>http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/trunk/sql12/plugins/dbcopy</url>
+ </scm>
+ <issueManagement>
+ <system>SourceForge Tracker</system>
+ <url>http://sourceforge.net/tracker/?group_id=28383%26atid=393414</url>
+ </issueManagement>
+ <ciManagement>
+ <system>Hudson</system>
+ <url>https://www.squirrel-sql.org/hudson/</url>
+ </ciManagement>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>unpack-deps</id>
+ <goals>
+ <goal>unpack-dependencies</goal>
+ </goals>
+ <phase>prepare-package</phase>
+ <configuration>
+
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>default-jar</id>
+ <phase>package</phase>
+ <goals>
+ <goal>jar</goal>
+ </goals>
+ <configuration>
+ <archive>
+ <manifest>
+ <mainClass>net.sourceforge.squirrel_sql.plugins.dbcopy.cli.DBCopyCLI</mainClass>
+ </manifest>
+ </archive>
+ <classesDirectory>${project.build.directory}/dependency</classesDirectory>
+ </configuration>
+ </execution>
+ </executions>
+
+ </plugin>
+ </plugins>
+ </build>
+ <dependencies>
+ <dependency>
+ <groupId>net.sf.squirrel-sql.plugins</groupId>
+ <artifactId>dbcopy</artifactId>
+ <version>3.3.0-SNAPSHOT</version>
+ </dependency>
+ <!-- <dependency>-->
+ <!-- <groupId>net.sf.squirrel-sql</groupId>-->
+ <!-- <artifactId>fw</artifactId>-->
+ <!-- <version>3.3.0-SNAPSHOT</version>-->
+ <!-- <type>pom</type>-->
+ <!-- </dependency>-->
+ <!-- <dependency>-->
+ <!-- <groupId>net.sf.squirrel-sql</groupId>-->
+ <!-- <artifactId>squirrel-sql</artifactId>-->
+ <!-- <version>3.3.0-SNAPSHOT</version>-->
+ <!-- </dependency>-->
+ </dependencies>
+</project>
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <man...@us...> - 2011-07-30 17:18:49
|
Revision: 6333
http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=6333&view=rev
Author: manningr
Date: 2011-07-30 17:18:42 +0000 (Sat, 30 Jul 2011)
Log Message:
-----------
relocated sql scripts to integration environment
Added Paths:
-----------
trunk/sql12/squirrelsql-integration-environment/src/test/resources/sql/
Removed Paths:
-------------
trunk/sql12/plugins/dbcopy/test/sql/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <man...@us...> - 2011-07-30 17:20:22
|
Revision: 6334
http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=6334&view=rev
Author: manningr
Date: 2011-07-30 17:20:16 +0000 (Sat, 30 Jul 2011)
Log Message:
-----------
relocated sql scripts to integration environment
Added Paths:
-----------
trunk/sql12/squirrelsql-integration-environment/src/test/resources/dbmonster/
Removed Paths:
-------------
trunk/sql12/plugins/dbcopy/test/dbmonster/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <wi...@us...> - 2011-08-04 21:26:24
|
Revision: 6339
http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=6339&view=rev
Author: wis775
Date: 2011-08-04 21:26:15 +0000 (Thu, 04 Aug 2011)
Log Message:
-----------
SQL Scripts Plugin: Added "Store result of SQL into file". This new function allows the user to store the result of the selected SQL directly into a file,
instead of showing a result table. This is avaiable in the tools pop-up (sql2file) and the menu (Session ==> Scripts ==> Store result of SQL in file).
There are really few new features. The main work was refactoring of TableExportCSVCommand to convert the access to the data structure into a more generic way, so that the source of the data are less important. Now, the source of the data could be a ResultSet or a JTable.
Modified Paths:
--------------
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/ISession.java
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/Session.java
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/ISQLExecuter.java
trunk/sql12/doc/src/main/resources/changes.txt
trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/gui/action/TableExportCsvCommand.java
trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/gui/action/TableExportCsvController.java
trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/util/ISessionProperties.java
trunk/sql12/fw/src/main/resources/net/sourceforge/squirrel_sql/fw/gui/action/I18NStrings.properties
trunk/sql12/fw/src/test/java/net/sourceforge/squirrel_sql/fw/gui/action/TableExportCsvCommandTest.java
trunk/sql12/plugins/sqlscript/src/main/java/net/sourceforge/squirrel_sql/plugins/sqlscript/SQLScriptPlugin.java
trunk/sql12/plugins/sqlscript/src/main/java/net/sourceforge/squirrel_sql/plugins/sqlscript/table_script/AbortController.java
trunk/sql12/plugins/sqlscript/src/main/java/net/sourceforge/squirrel_sql/plugins/sqlscript/table_script/CreateDataScriptCommand.java
trunk/sql12/plugins/sqlscript/src/main/resources/net/sourceforge/squirrel_sql/plugins/sqlscript/sqlscript.properties
trunk/sql12/plugins/sqlscript/src/main/resources/net/sourceforge/squirrel_sql/plugins/sqlscript/table_script/I18NStrings.properties
Added Paths:
-----------
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/IAbortEventHandler.java
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/ProgressAbortDialog.java
trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/gui/action/AbstractExportCommand.java
trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/gui/action/ResultSetExportCommand.java
trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/gui/action/ResultSetExportCsvController.java
trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/gui/action/exportData/
trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/gui/action/exportData/AbstractDataExportFileWriter.java
trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/gui/action/exportData/DataExportCSVWriter.java
trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/gui/action/exportData/DataExportExcelWriter.java
trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/gui/action/exportData/DataExportXMLWriter.java
trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/gui/action/exportData/ExportDataColumn.java
trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/gui/action/exportData/ExportDataRow.java
trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/gui/action/exportData/IDataExportWriter.java
trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/gui/action/exportData/IExportData.java
trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/gui/action/exportData/IExportDataCell.java
trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/gui/action/exportData/IExportDataRow.java
trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/gui/action/exportData/JTableExportData.java
trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/gui/action/exportData/ResultSetExportData.java
trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/sql/IAbortController.java
trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/sql/ISQLExecutionCallback.java
trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/sql/ProgressAbortCallback.java
trunk/sql12/plugins/sqlscript/src/main/java/net/sourceforge/squirrel_sql/plugins/sqlscript/table_script/AbstractDataScriptCommand.java
trunk/sql12/plugins/sqlscript/src/main/java/net/sourceforge/squirrel_sql/plugins/sqlscript/table_script/CreateFileOfCurrentSQLAction.java
trunk/sql12/plugins/sqlscript/src/main/java/net/sourceforge/squirrel_sql/plugins/sqlscript/table_script/CreateFileOfCurrentSQLCommand.java
Removed Paths:
-------------
trunk/sql12/plugins/sqlscript/src/main/java/net/sourceforge/squirrel_sql/plugins/sqlscript/table_script/IAbortController.java
Added: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/IAbortEventHandler.java
===================================================================
--- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/IAbortEventHandler.java (rev 0)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/IAbortEventHandler.java 2011-08-04 21:26:15 UTC (rev 6339)
@@ -0,0 +1,32 @@
+/*
+ * Copyright (C) 2011 Stefan Willinger
+ * wi...@us...
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+package net.sourceforge.squirrel_sql.client.gui;
+
+/**
+ * Interface, to handle a cancel event of a {@link ProgressAbortDialog}
+ * @author Stefan Willinger
+ *
+ */
+public interface IAbortEventHandler {
+
+ /**
+ * Called, if a cancel of the operation was requested
+ */
+ void cancel();
+}
Property changes on: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/IAbortEventHandler.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/ProgressAbortDialog.java
===================================================================
--- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/ProgressAbortDialog.java (rev 0)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/ProgressAbortDialog.java 2011-08-04 21:26:15 UTC (rev 6339)
@@ -0,0 +1,430 @@
+/*
+ * Copyright (C) 2011 Stefan Willinger
+ * wi...@us...
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+package net.sourceforge.squirrel_sql.client.gui;
+
+import java.awt.Dialog;
+import java.awt.Dimension;
+import java.awt.Frame;
+import java.awt.GridBagConstraints;
+import java.awt.GridBagLayout;
+import java.awt.Insets;
+import java.awt.Window;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.text.DateFormat;
+import java.util.Date;
+
+import javax.swing.BorderFactory;
+import javax.swing.JButton;
+import javax.swing.JDialog;
+import javax.swing.JLabel;
+import javax.swing.JPanel;
+import javax.swing.JProgressBar;
+import javax.swing.JScrollPane;
+import javax.swing.JTextArea;
+
+import net.sourceforge.squirrel_sql.fw.gui.GUIUtils;
+import net.sourceforge.squirrel_sql.fw.sql.ProgressAbortCallback;
+import net.sourceforge.squirrel_sql.fw.sql.ProgressCallBack;
+import net.sourceforge.squirrel_sql.fw.util.StringManager;
+import net.sourceforge.squirrel_sql.fw.util.StringManagerFactory;
+import net.sourceforge.squirrel_sql.fw.util.StringUtilities;
+import net.sourceforge.squirrel_sql.fw.util.log.ILogger;
+import net.sourceforge.squirrel_sql.fw.util.log.LoggerController;
+
+/**
+ * A monitor, which provide certain information to the user about a long running operation.
+ * The user get information about the progress of a long running operation. In addition to the progress bar, each step is reported in a
+ * "history area".
+ * This monitor provides the opportunity to cancel the operation.
+ * Sometimes it is not known, how many tasks must be completed, until the whole operation is finished. For this case, the monitor can be run in "indeterminate" mode.
+ * Depending on indeterminate or not, we can or cann't claim that the overall progress is finished.
+ * @see JProgressBar#isIndeterminate()
+ * @author Stefan Willinger
+ *
+ */
+public class ProgressAbortDialog extends JDialog implements ProgressAbortCallback{
+ /**
+ * serialVersionUID
+ */
+ private static final long serialVersionUID = 1L;
+
+ /** Logger for this class. */
+ public final static ILogger s_log = LoggerController.createLogger(ProgressCallBackDialog.class);
+
+ /** Internationalized strings for this class */
+ private static final StringManager s_stringMgr =
+ StringManagerFactory.getStringManager(ProgressCallBackDialog.class);
+
+ static interface i18n
+ {
+ // i18n[ProgressCallBackDialog.defaultLoadingPrefix=Loading:]
+ String DEFAULT_LOADING_PREFIX = s_stringMgr.getString("ProgressCallBackDialog.defaultLoadingPrefix");
+
+ // i18n[ProgressCallBackDialog.initialLoadingPrefix=Loading...]
+ String INITIAL_LOADING_PREFIX = s_stringMgr.getString("ProgressCallBackDialog.initialLoadingPrefix");
+ }
+
+ /**
+ * Dateformat for the hisotry area.
+ */
+ private DateFormat dateFormat = DateFormat.getTimeInstance();
+
+
+ /**
+ * The number of task, until the opeartion is completed.
+ */
+ private int itemCount = 0;
+
+ /**
+ * The progressbar itself
+ */
+ private JProgressBar progressBar = null;
+
+ /**
+ * The place to show the current task
+ */
+ private JLabel statusLabel = null;
+
+ private String _loadingPrefix = i18n.DEFAULT_LOADING_PREFIX;
+
+ /**
+ * True, if we dont know, how many tasks are neccesary to complete the operation
+ * @see JProgressBar#setIndeterminate(boolean)
+ */
+ private boolean indeterminate;
+
+ /**
+ * A callback handler, if the user decided to abort the operation.
+ */
+ private IAbortEventHandler abortHandler;
+
+ private JButton cancelButton;
+
+ /**
+ * Area to display the already completed tasks of this operation.
+ */
+ private JTextArea historyArea;
+
+ /**
+ * Description of the long running operation.
+ */
+ private JLabel taskDescriptionLabel;
+
+ /**
+ * Flag, if the operation should be canceled
+ */
+ private boolean canceled;
+
+ /**
+ * Constructor which accepts a Dialog owner
+ *
+ * @param owner
+ * the owner Dialog from which the dialog is displayed or null if this dialog has no owner
+ * @param title
+ * the String to display in the dialog's title bar
+ * @param totalItems
+ * the total number of items at which point progress will indicate complete
+ * @param indeterminate true, if the {@link JProgressBar} should be used in the indeterminate mode.
+ * @param abortHandler If the underlying tasks maybe aborted, then a abort Handler is needed. Otherwise null.
+ * @see JProgressBar#setIndeterminate(boolean)
+ */
+ public ProgressAbortDialog(Dialog owner, String title, String description, int totalItems, boolean indeterminate, IAbortEventHandler abortHandler)
+ {
+ super(owner, title);
+ init(description, totalItems, indeterminate, abortHandler);
+ }
+
+ /**
+ * Constructor which accepts a Frame owner
+ *
+ * @param owner
+ * the owner Frame from which the dialog is displayed or null if this dialog has no owner
+ * @param title
+ * the String to display in the dialog's title bar
+ * @param totalItems
+ * the total number of items at which point progress will indicate complete
+ * @param indeterminate true, if the {@link JProgressBar} should be used in the indeterminate mode.
+ * @param abortHandler If the underlying tasks maybe aborted, then a abort Handler is needed. Otherwise null.
+ * @see JProgressBar#setIndeterminate(boolean)
+ */
+ public ProgressAbortDialog(Frame owner, String title, String description, int totalItems, boolean indeterminate, IAbortEventHandler abortHandler)
+ {
+ super(owner, title);
+ setLocationRelativeTo(owner);
+ init(description, totalItems, indeterminate, abortHandler);
+ }
+
+ /**
+ * @see net.sourceforge.squirrel_sql.fw.sql.ProgressCallBack#setTotalItems(int)
+ */
+ @Override
+ public void setTotalItems(int totalItems)
+ {
+ itemCount = totalItems;
+ progressBar.setMaximum(totalItems);
+ }
+
+ /**
+ * Sets the text that is displayed before each thing being loaded. By default this is the string
+ * "Loading:".
+ *
+ * @param loadingPrefix
+ */
+ @Override
+ public void setLoadingPrefix(String loadingPrefix)
+ {
+ if (loadingPrefix != null)
+ {
+ _loadingPrefix = loadingPrefix;
+ }
+ }
+
+ /**
+ * @see net.sourceforge.squirrel_sql.fw.sql.ProgressCallBack#currentlyLoading(java.lang.String)
+ */
+ @Override
+ public void currentlyLoading(final String simpleName)
+ {
+ final StringBuilder statusText = new StringBuilder();
+ statusText.append(_loadingPrefix);
+ statusText.append(" ");
+ statusText.append(simpleName);
+
+ appendToHistory(statusText.toString());
+
+ try
+ {
+ GUIUtils.processOnSwingEventThread(new Runnable()
+ {
+ public void run()
+ {
+ statusLabel.setText(statusText.toString());
+ progressBar.setValue(progressBar.getValue() + 1);
+
+ if (finishedLoading())
+ {
+ ProgressAbortDialog.this.setVisible(false);
+ return;
+ }
+ }
+ });
+ }
+ catch (Exception e)
+ {
+ s_log.error("Unexpected exception: " + e.getMessage(), e);
+ }
+ }
+
+ /**
+ * @param string
+ */
+ private void appendToHistory(String string) {
+ if(this.historyArea != null){
+ StringBuilder sb = new StringBuilder();
+ sb.append(dateFormat.format(new Date()));
+ sb.append(": ");
+ sb.append(string);
+ sb.append(StringUtilities.getEolStr());
+ this.historyArea.append(sb.toString());
+ this.historyArea.setCaretPosition(historyArea.getDocument().getLength());
+ }
+ }
+
+ /**
+ * Checks, if the overall progress is finished.
+ * If this monitor runs in indeterminate mode, we didn't know, if the progress is finished.
+ * Otherwise, the finish state is interpreted, if we have reached the necessary task count.
+ * @see net.sourceforge.squirrel_sql.fw.sql.ProgressCallBack#finishedLoading()
+ */
+ @Override
+ public boolean finishedLoading()
+ {
+ if(this.indeterminate){
+ return false;
+ }
+ return progressBar.getValue() == itemCount;
+ }
+
+ /**
+ * Dispose this monitor.
+ * @see java.awt.Window#dispose()
+ */
+ @Override
+ public void dispose()
+ {
+ GUIUtils.processOnSwingEventThread(new Runnable()
+ {
+ @Override
+ public void run()
+ {
+ callDisposeFromSuperClass();
+ }
+ });
+ }
+
+ /**
+ * Since {@link #dispose()} uses an {@link Runnable}, we needs an
+ * delegate to call the overridden dispose method.
+ */
+ private void callDisposeFromSuperClass(){
+ super.dispose();
+ }
+
+ /**
+ * @see java.awt.Dialog#setVisible(boolean)
+ */
+ @Override
+ public void setVisible(final boolean b)
+ {
+ GUIUtils.processOnSwingEventThread(new Runnable()
+ {
+ @Override
+ public void run()
+ {
+ callSetVisibleFromSuperClass(b);
+ }
+ });
+ }
+
+ /**
+ * Since {@link #setVisible(boolean)} uses an {@link Runnable}, we needs an
+ * delegate to call the overridden setVisible method.
+ */
+ private void callSetVisibleFromSuperClass(final boolean b){
+ super.setVisible(b);
+ }
+
+
+ private void init(String description, int totalItems, boolean intermediate, IAbortEventHandler abortHandler)
+ {
+ itemCount = totalItems;
+ this.indeterminate = intermediate;
+ this.abortHandler = abortHandler;
+ final Window owner = super.getOwner();
+ final ProgressAbortDialog dialog = this;
+ createGUI(description);
+ setLocationRelativeTo(owner);
+ dialog.setVisible(true);
+ }
+
+ private void createGUI(String description)
+ {
+ JPanel dialogPanel = new JPanel(new GridBagLayout());
+ dialogPanel.setBorder(BorderFactory.createEmptyBorder(0, 10, 0, 10));
+ GridBagConstraints c;
+
+ c = new GridBagConstraints();
+ c.gridx = 0;
+ c.gridy = 0;
+ c.fill = GridBagConstraints.HORIZONTAL;
+ c.anchor = GridBagConstraints.WEST;
+ c.insets = new Insets(4, 0, 4, 0);
+ taskDescriptionLabel = new JLabel(description);
+ dialogPanel.add(taskDescriptionLabel, c);
+
+ c.gridy++;
+ c.insets = new Insets(4, 10, 4, 10);
+ statusLabel = new JLabel(i18n.INITIAL_LOADING_PREFIX);
+ dialogPanel.add(statusLabel, c);
+
+ c.gridy++;
+ c.weightx = 1.0;
+ progressBar = new JProgressBar(0, itemCount);
+ progressBar.setIndeterminate(indeterminate);
+ dialogPanel.add(progressBar, c);
+
+ c.gridy++;
+ c.fill = GridBagConstraints.BOTH;
+ c.weightx=1.0;
+ c.weighty=1.0;
+ historyArea = new JTextArea();
+ historyArea.setEditable(false);
+ JScrollPane jScrollPane = new JScrollPane(historyArea);
+ dialogPanel.add(jScrollPane, c);
+
+
+ if(abortHandler != null){
+ cancelButton = new JButton("Cancel");
+ cancelButton.addActionListener(new ActionListener() {
+ @Override
+ public void actionPerformed(ActionEvent e) {
+ appendToHistory("Canceling the operation");
+ canceled = true;
+ cancelButton.setEnabled(false);
+ abortHandler.cancel();
+
+ }
+ });
+
+ c.gridy++;
+ c.anchor = GridBagConstraints.WEST;
+ c.fill = GridBagConstraints.HORIZONTAL;
+ c.weightx=0.0;
+ c.weighty=0.0;
+ dialogPanel.add(cancelButton, c);
+ }
+
+ super.getContentPane().add(dialogPanel);
+ super.pack();
+ super.setSize(new Dimension(400, 400));
+ super.setDefaultCloseOperation(JDialog.DISPOSE_ON_CLOSE);
+ }
+
+ /**
+ * Just for playing...
+ */
+ public static void main(String[] args) throws Exception {
+ IAbortEventHandler handler = new IAbortEventHandler() {
+
+ @Override
+ public void cancel() {
+ System.out.println("echo");
+ }
+ };
+
+ ProgressCallBack dialog = new ProgressAbortDialog((Frame)null, "myTitle", "myDescription", 0, true, handler);
+ Thread.sleep(3000);
+ dialog.currentlyLoading("Running query");
+ Thread.sleep(3000);
+ dialog.currentlyLoading("1 Row(s) exported");
+ Thread.sleep(3000);
+ dialog.currentlyLoading("100 Row(s) exported");
+ Thread.sleep(3000);
+ dialog.currentlyLoading("1000 Row(s) exported");
+ dialog.currentlyLoading("Finished");
+
+ }
+
+ /**
+ * @see net.sourceforge.squirrel_sql.fw.sql.IAbortController#isStop()
+ */
+ @Override
+ public boolean isStop() {
+ return this.canceled;
+ }
+
+ /**
+ * @see net.sourceforge.squirrel_sql.fw.sql.IAbortController#isVisble()
+ */
+ @Override
+ public boolean isVisble() {
+ return super.isVisible();
+ }
+}
Property changes on: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/ProgressAbortDialog.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Modified: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/ISession.java
===================================================================
--- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/ISession.java 2011-08-03 23:24:32 UTC (rev 6338)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/ISession.java 2011-08-04 21:26:15 UTC (rev 6339)
@@ -20,6 +20,11 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+import java.sql.SQLException;
+
+import javax.swing.Action;
+import javax.swing.JComponent;
+
import net.sourceforge.squirrel_sql.client.IApplication;
import net.sourceforge.squirrel_sql.client.gui.db.ISQLAliasExt;
import net.sourceforge.squirrel_sql.client.gui.desktopcontainer.ISessionWidget;
@@ -36,12 +41,10 @@
import net.sourceforge.squirrel_sql.fw.sql.ISQLConnection;
import net.sourceforge.squirrel_sql.fw.sql.ISQLDatabaseMetaData;
import net.sourceforge.squirrel_sql.fw.sql.ISQLDriver;
+import net.sourceforge.squirrel_sql.fw.sql.SQLConnection;
import net.sourceforge.squirrel_sql.fw.util.ExceptionFormatter;
import net.sourceforge.squirrel_sql.fw.util.IMessageHandler;
-import javax.swing.*;
-import java.sql.SQLException;
-
/**
* The current session.
*/
@@ -378,5 +381,13 @@
void showErrorMessage(String msg);
void showWarningMessage(String msg);
-
+
+ /**
+ * Create a new connection, which is not associated with the current session.
+ * The new {@link SQLConnection} will is based on the same alias, user name and password of the current session. But it will be not associated with the session.
+ * Please note, that a commit and roll back on the current session will not affect the new created connection.
+ * The caller have to manage the connection by himself. Especially commit, roll back, close and so on.
+ * @return A new connection for the alias of the current session.
+ */
+ public SQLConnection createUnmanagedConnection();
}
Modified: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/Session.java
===================================================================
--- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/Session.java 2011-08-03 23:24:32 UTC (rev 6338)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/Session.java 2011-08-04 21:26:15 UTC (rev 6339)
@@ -68,6 +68,7 @@
import net.sourceforge.squirrel_sql.fw.sql.SQLConnectionState;
import net.sourceforge.squirrel_sql.fw.sql.SQLDatabaseMetaData;
import net.sourceforge.squirrel_sql.fw.sql.TokenizerSessPropsInteractions;
+import net.sourceforge.squirrel_sql.fw.util.BaseException;
import net.sourceforge.squirrel_sql.fw.util.DefaultExceptionFormatter;
import net.sourceforge.squirrel_sql.fw.util.ExceptionFormatter;
import net.sourceforge.squirrel_sql.fw.util.IMessageHandler;
@@ -1192,4 +1193,22 @@
_msgHandler.showWarningMessage(msg);
}
+ /**
+ * @see net.sourceforge.squirrel_sql.client.session.ISession#createUnmanagedConnection()
+ */
+ public SQLConnection createUnmanagedConnection() {
+ SQLConnectionState connState = new SQLConnectionState();
+
+ OpenConnectionCommand cmd = new OpenConnectionCommand(_app, _alias,
+ _user, _password, connState.getConnectionProperties());
+ try {
+ cmd.execute();
+ } catch (BaseException e) {
+ showErrorMessage(e);
+ return null;
+ }
+
+ return cmd.getSQLConnection();
+ }
+
}
Modified: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/ISQLExecuter.java
===================================================================
--- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/ISQLExecuter.java 2011-08-03 23:24:32 UTC (rev 6338)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/ISQLExecuter.java 2011-08-04 21:26:15 UTC (rev 6339)
@@ -28,6 +28,7 @@
* This is the interface that can store executors for SQL.
*
*/
+@Deprecated
public interface ISQLExecuter
{
/** Returns the title of this executor.*/
Modified: trunk/sql12/doc/src/main/resources/changes.txt
===================================================================
--- trunk/sql12/doc/src/main/resources/changes.txt 2011-08-03 23:24:32 UTC (rev 6338)
+++ trunk/sql12/doc/src/main/resources/changes.txt 2011-08-04 21:26:15 UTC (rev 6339)
@@ -7,6 +7,11 @@
Enhancements:
+
+SQL Scripts Plugin: Added "Store result of SQL into file". This new function allows the user to store the result of the selected SQL directly into a file,
+ instead of showing a result table. This is avaiable in the tools pop-up (sql2file) and the menu (Session ==> Scripts ==> Store result of SQL in file).
+
+
DBCopy Plugin: (Feature request #3291501) This plugin now has a command-line interface (via DBCopyCLI). See
DBCopy plugin documentation for usage details.
@@ -93,6 +98,8 @@
Bug-fixes:
+The column numbers of the header columns are now correct, when exporting the result table as XML.
+
When displaying the content of a table, the dialog "Please wait while the query is executed" may not dispose.
This may occurs only for tables of a "In Memory Database" with only a few rows of data.
Added: trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/gui/action/AbstractExportCommand.java
===================================================================
--- trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/gui/action/AbstractExportCommand.java (rev 0)
+++ trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/gui/action/AbstractExportCommand.java 2011-08-04 21:26:15 UTC (rev 6339)
@@ -0,0 +1,243 @@
+/*
+ * Copyright (C) 2011 Stefan Willinger
+ * wi...@us...
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+package net.sourceforge.squirrel_sql.fw.gui.action;
+
+import java.io.File;
+import java.io.IOException;
+
+import javax.swing.JOptionPane;
+
+import net.sourceforge.squirrel_sql.fw.gui.GUIUtils;
+import net.sourceforge.squirrel_sql.fw.gui.action.TableExportCsvCommand.i18n;
+import net.sourceforge.squirrel_sql.fw.gui.action.exportData.DataExportCSVWriter;
+import net.sourceforge.squirrel_sql.fw.gui.action.exportData.DataExportExcelWriter;
+import net.sourceforge.squirrel_sql.fw.gui.action.exportData.DataExportXMLWriter;
+import net.sourceforge.squirrel_sql.fw.gui.action.exportData.IExportData;
+import net.sourceforge.squirrel_sql.fw.sql.ProgressAbortCallback;
+import net.sourceforge.squirrel_sql.fw.util.StringManager;
+import net.sourceforge.squirrel_sql.fw.util.StringManagerFactory;
+import net.sourceforge.squirrel_sql.fw.util.log.ILogger;
+import net.sourceforge.squirrel_sql.fw.util.log.LoggerController;
+
+/**
+ * Abstract command for exporting Data.
+ * This command exports the specified {@link IExportData}. The main configuration of the export could be managed with the {@link TableExportCsvController}.
+ * A {@link ProgressAbortCallback} can monitor the progress, but there must not be a such monitor.
+ * There are several target formats supported:
+ * <li>CSV</li>
+ * <li>XML</li>
+ * <li>XLS</li>
+ * But be aware, exporting to the excel format may use huge heap space, because the data structure must be build in memory.
+ * <p>
+ * The basic idea is, that Squirrel is able to export each table organized data structure by the same way.
+ * Independent, if the source of the data is a JTable, a result set or whatever. Its only important, that the data is tabulated. This is ensured by the
+ * interface {@link IExportData}. There are existing some DataExportWriters for various target formats.
+ *
+ * <b>Note:</b> This class is the result of a refactoring task. The code was taken from TableExportCsvCommand.
+ * @see DataExportCSVWriter
+ * @see DataExportXMLWriter
+ * @see DataExportExcelWriter
+ *
+ * @author Stefan Willinger
+ *
+ */
+public abstract class AbstractExportCommand {
+ static final StringManager s_stringMgr = StringManagerFactory
+ .getStringManager(AbstractExportCommand.class);
+ static ILogger s_log = LoggerController.createLogger(AbstractExportCommand.class);
+ private boolean cancel;
+ private ProgressAbortCallback progressController = null;
+
+ /**
+ * @param progressController
+ */
+ public AbstractExportCommand() {
+
+ }
+
+ /**
+ * @param progressController
+ */
+ public AbstractExportCommand(ProgressAbortCallback progressController) {
+ this.progressController =progressController;
+ }
+
+
+ protected boolean writeFile(TableExportCsvController ctrl, IExportData data) {
+ File file = null;
+ try {
+
+ file = ctrl.getFile();
+ if (null != file.getParentFile()) {
+ file.getParentFile().mkdirs();
+ }
+
+ boolean includeHeaders = ctrl.includeHeaders();
+
+ if (TableExportCsvController.EXPORT_FORMAT_CSV == ctrl.getExportFormat()) {
+ return new DataExportCSVWriter(file, ctrl, includeHeaders, progressController).write(data);
+ } else if (TableExportCsvController.EXPORT_...
[truncated message content] |
