|
From: <ger...@us...> - 2012-05-16 23:33:39
|
Revision: 6626
http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=6626&view=rev
Author: gerdwagner
Date: 2012-05-16 23:33:33 +0000 (Wed, 16 May 2012)
Log Message:
-----------
Multisource Plugin:
1. Brushed up the 'Add Virtualization' dialog's GUI layout.
2. Normalized generated Virtualization Schema names.
To do that some refactoring was done: Method moved form GraphUtil of the Graph Plugin to fw's StringUtilities.
Modified Paths:
--------------
trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/util/StringUtilities.java
trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/GraphUtil.java
trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/xmlbeans/DefaultGraphXmlSerializerConfig.java
trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/xmlbeans/GraphXmlSerializer.java
trunk/sql12/plugins/multisource/src/main/java/net/sourceforge/squirrel_sql/plugins/multisource/MultiAliasChooser.java
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 2012-05-16 16:34:25 UTC (rev 6625)
+++ trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/util/StringUtilities.java 2012-05-16 23:33:33 UTC (rev 6626)
@@ -284,4 +284,35 @@
buf = buf.replaceAll("\"", """);
return buf;
}
+
+ public static String javaNormalize(String text)
+ {
+ StringBuffer buf = new StringBuffer(text.length());
+
+ if(Character.isJavaIdentifierStart(text.charAt(0)) )
+ {
+ buf.append(text.charAt(0));
+ }
+ else
+ {
+ buf.append('_');
+ }
+
+
+ for(int i=1; i < text.length(); ++i)
+ {
+ if ( Character.isLetterOrDigit(text.charAt(i)) )
+ {
+ buf.append(text.charAt(i));
+ }
+ else
+ {
+ buf.append('_');
+ }
+ }
+
+ String ret = buf.toString();
+
+ return ret;
+ }
}
Modified: trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/GraphUtil.java
===================================================================
--- trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/GraphUtil.java 2012-05-16 16:34:25 UTC (rev 6625)
+++ trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/GraphUtil.java 2012-05-16 23:33:33 UTC (rev 6626)
@@ -4,6 +4,7 @@
import net.sourceforge.squirrel_sql.fw.sql.PrimaryKeyInfo;
import net.sourceforge.squirrel_sql.fw.sql.SQLDatabaseMetaData;
import net.sourceforge.squirrel_sql.fw.sql.TableColumnInfo;
+import net.sourceforge.squirrel_sql.fw.util.StringUtilities;
import java.sql.SQLException;
import java.util.ArrayList;
@@ -115,44 +116,13 @@
return true;
}
- public static String javaNormalize(String text)
- {
- StringBuffer buf = new StringBuffer(text.length());
-
- if(Character.isJavaIdentifierStart(text.charAt(0)) )
- {
- buf.append(text.charAt(0));
- }
- else
- {
- buf.append('_');
- }
-
-
- for(int i=1; i < text.length(); ++i)
- {
- if ( Character.isLetterOrDigit(text.charAt(i)) )
- {
- buf.append(text.charAt(i));
- }
- else
- {
- buf.append('_');
- }
- }
-
- String ret = buf.toString();
-
- return ret;
- }
-
public static String createGraphFileName(String url, String title)
{
- return createGraphFileNamePrefixForUrl(url) + javaNormalize(title);
+ return createGraphFileNamePrefixForUrl(url) + StringUtilities.javaNormalize(title);
}
public static String createGraphFileNamePrefixForUrl(String url)
{
- return javaNormalize(url) + ".";
+ return StringUtilities.javaNormalize(url) + ".";
}
}
Modified: trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/xmlbeans/DefaultGraphXmlSerializerConfig.java
===================================================================
--- trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/xmlbeans/DefaultGraphXmlSerializerConfig.java 2012-05-16 16:34:25 UTC (rev 6625)
+++ trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/xmlbeans/DefaultGraphXmlSerializerConfig.java 2012-05-16 23:33:33 UTC (rev 6626)
@@ -3,6 +3,7 @@
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.fw.util.StringUtilities;
import net.sourceforge.squirrel_sql.plugins.graph.GraphPlugin;
import net.sourceforge.squirrel_sql.plugins.graph.GraphUtil;
import net.sourceforge.squirrel_sql.plugins.graph.link.LinkXmlBean;
@@ -120,7 +121,7 @@
public static String getLinkPrefix(ISession session)
{
- return LINK_PREFIX + GraphUtil.javaNormalize(session.getAlias().getUrl()) + ".";
+ return LINK_PREFIX + StringUtilities.javaNormalize(session.getAlias().getUrl()) + ".";
}
private String getFileName(String path, String url, String title)
Modified: trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/xmlbeans/GraphXmlSerializer.java
===================================================================
--- trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/xmlbeans/GraphXmlSerializer.java 2012-05-16 16:34:25 UTC (rev 6625)
+++ trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/xmlbeans/GraphXmlSerializer.java 2012-05-16 23:33:33 UTC (rev 6626)
@@ -13,7 +13,6 @@
import net.sourceforge.squirrel_sql.fw.xml.XMLBeanReader;
import net.sourceforge.squirrel_sql.fw.xml.XMLBeanWriter;
import net.sourceforge.squirrel_sql.plugins.graph.GraphPlugin;
-import net.sourceforge.squirrel_sql.plugins.graph.GraphUtil;
import net.sourceforge.squirrel_sql.plugins.graph.link.LinkXmlBean;
@@ -107,7 +106,7 @@
{
try
{
- final String urlPrefix = GraphUtil.javaNormalize(session.getAlias().getUrl()) + ".";
+ final String urlPrefix = StringUtilities.javaNormalize(session.getAlias().getUrl()) + ".";
FileWrapper[] graphXmlFiles = plugin.getPluginUserSettingsFolder().listFiles(new FilenameFilter()
{
Modified: trunk/sql12/plugins/multisource/src/main/java/net/sourceforge/squirrel_sql/plugins/multisource/MultiAliasChooser.java
===================================================================
--- trunk/sql12/plugins/multisource/src/main/java/net/sourceforge/squirrel_sql/plugins/multisource/MultiAliasChooser.java 2012-05-16 16:34:25 UTC (rev 6625)
+++ trunk/sql12/plugins/multisource/src/main/java/net/sourceforge/squirrel_sql/plugins/multisource/MultiAliasChooser.java 2012-05-16 23:33:33 UTC (rev 6626)
@@ -1,8 +1,6 @@
package net.sourceforge.squirrel_sql.plugins.multisource;
-import java.awt.Container;
-import java.awt.Frame;
-import java.awt.GridLayout;
+import java.awt.*;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import java.lang.reflect.Method;
@@ -28,6 +26,7 @@
import net.sourceforge.squirrel_sql.fw.sql.SQLDriverManager;
import net.sourceforge.squirrel_sql.fw.util.StringManager;
import net.sourceforge.squirrel_sql.fw.util.StringManagerFactory;
+import net.sourceforge.squirrel_sql.fw.util.StringUtilities;
/**
* A dialog that allows a user to select an existing alias to add to the
@@ -50,11 +49,11 @@
public MultiAliasChooser(IApplication app, ISession session, ArrayList<ISQLAlias> aliasList) {
super((Frame) null, s_stringMgr.getString("MultiAliasChooser.title"), true);
- setSize(300, 200);
_aliasList = aliasList;
_app = app;
_session = session;
createUserInterface();
+ pack();
}
/**
@@ -70,37 +69,46 @@
*/
private void createUserInterface() {
Container contentPane = getContentPane();
+ contentPane.setLayout(new BorderLayout());
- JPanel content = new JPanel(new GridLayout(4, 1));
+ JPanel content = new JPanel(new GridBagLayout());
+ GridBagConstraints gbc;
+
// Alias combobox and label
- content.add(new JLabel(s_stringMgr.getString("MultiAliasChooser.prompt"), JLabel.LEFT));
- _aliasCbx = new JComboBox(_aliasList.toArray());
+ gbc = new GridBagConstraints(0, 0, 2, 1, 0, 0, GridBagConstraints.NORTHWEST, GridBagConstraints.NONE, new Insets(5,5,5,5), 0,0);
+ content.add(new JLabel(s_stringMgr.getString("MultiAliasChooser.prompt"), JLabel.LEFT), gbc);
+
+ gbc = new GridBagConstraints(0, 1, 2, 1, 0, 0, GridBagConstraints.NORTHWEST, GridBagConstraints.HORIZONTAL, new Insets(0,5,10,5), 0,0);
+ _aliasCbx = new JComboBox(_aliasList.toArray());
_aliasCbx.setMaximumRowCount(5); // Display up to 5 rows without a scrollbar
- content.add(_aliasCbx);
+ content.add(_aliasCbx, gbc);
// Name textbox and label
- JPanel namePanel = new JPanel();
- namePanel.add(new JLabel(s_stringMgr.getString("MultiAliasChooser.name"), JLabel.LEFT));
+ gbc = new GridBagConstraints(0, 2, 1, 1, 0, 0, GridBagConstraints.NORTHWEST, GridBagConstraints.NONE, new Insets(5,5,5,5), 0,0);
+ content.add(new JLabel(s_stringMgr.getString("MultiAliasChooser.name"), JLabel.LEFT), gbc);
_nameTxt = new JTextField(15);
_nameTxt.setText(_aliasList.get(0).toString());
- namePanel.add(_nameTxt);
- content.add(namePanel);
+ gbc = new GridBagConstraints(1, 2, 1, 1, 0, 0, GridBagConstraints.NORTHWEST, GridBagConstraints.HORIZONTAL, new Insets(5,5,5,5), 0,0);
+ content.add(_nameTxt, gbc);
+
// Schema textbox and label
- JPanel schemaPanel = new JPanel();
- schemaPanel.add(new JLabel(s_stringMgr.getString("MultiAliasChooser.schema"), JLabel.LEFT));
+ gbc = new GridBagConstraints(0, 3, 1, 1, 0, 0, GridBagConstraints.NORTHWEST, GridBagConstraints.NONE, new Insets(5,5,5,5), 0,0);
+ content.add(new JLabel(s_stringMgr.getString("MultiAliasChooser.schema"), JLabel.LEFT), gbc);
_schemaTxt = new JTextField(15);
- schemaPanel.add(_schemaTxt);
- content.add(schemaPanel);
- contentPane.add(content, "Center");
+ gbc = new GridBagConstraints(1, 3, 1, 1, 0, 0, GridBagConstraints.NORTHWEST, GridBagConstraints.HORIZONTAL, new Insets(5,5,5,5), 0,0);
+ content.add(_schemaTxt, gbc);
+
+ contentPane.add(content, BorderLayout.CENTER);
+
// Buttons
- contentPane.add(createButtonsPanel(), "South");
+ contentPane.add(createButtonsPanel(), BorderLayout.SOUTH);
_aliasCbx.addActionListener(new ActionListener() {
public void actionPerformed(ActionEvent evt) {
- _sourceName = ((ISQLAlias) _aliasCbx.getSelectedItem()).getName();
+ _sourceName = StringUtilities.javaNormalize(((ISQLAlias) _aliasCbx.getSelectedItem()).getName());
_nameTxt.setText(_sourceName);
}
});
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
