Revision: 6578
http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=6578&view=rev
Author: gerdwagner
Date: 2012-02-15 19:54:16 +0000 (Wed, 15 Feb 2012)
Log Message:
-----------
Copy as INSERT-VALUES statement now works on almost any table not just on editable tables. If a table isn't in
a Session scope ";" is used as statement separator instead of the separator defined in Session properties.
Modified Paths:
--------------
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/DataSetUpdateableTableModelImpl.java
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/SQLExecuterTask.java
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/ResultTab.java
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/objecttree/tabs/BaseDataSetTab.java
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/objecttree/tabs/BasePreparedStatementTab.java
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/overview/OverwiewCtrl.java
trunk/sql12/doc/src/main/resources/changes.txt
trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/datasetviewer/BaseDataSetViewerDestination.java
trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/datasetviewer/DataSetScrollingPanel.java
trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/datasetviewer/DataSetViewerEditableTablePanel.java
trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/datasetviewer/DataSetViewerTablePanel.java
trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/datasetviewer/IDataSetUpdateableModel.java
trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/datasetviewer/IDataSetViewer.java
trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/gui/TablePopupMenu.java
trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/link/LinkGraphDialog.java
trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/nondbconst/ConfigureNonDbConstraintDlg.java
trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/mapping/DetailPanel.java
trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/mapping/DetailPanelController.java
trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/mapping/MappedObjectPanelManager.java
trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/viewobjects/SingleResultController.java
Added Paths:
-----------
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/DefaultDataModelImplementationDetails.java
Modified: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/DataSetUpdateableTableModelImpl.java
===================================================================
--- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/DataSetUpdateableTableModelImpl.java 2012-02-13 23:31:09 UTC (rev 6577)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/DataSetUpdateableTableModelImpl.java 2012-02-15 19:54:16 UTC (rev 6578)
@@ -166,16 +166,6 @@
}
- public IDataModelImplementationDetails getDataModelImplementationDetails()
- {
- return new IDataModelImplementationDetails()
- {
- public String getStatementSeparator()
- {
- return _session.getQueryTokenizer().getSQLStatementSeparator();
- }
- };
- }
/**
* If the user has forced us into editing mode, use the EDITABLE_TABLE form, but
Added: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/DefaultDataModelImplementationDetails.java
===================================================================
--- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/DefaultDataModelImplementationDetails.java (rev 0)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/DefaultDataModelImplementationDetails.java 2012-02-15 19:54:16 UTC (rev 6578)
@@ -0,0 +1,32 @@
+package net.sourceforge.squirrel_sql.client.session;
+
+import net.sourceforge.squirrel_sql.fw.datasetviewer.IDataModelImplementationDetails;
+
+public class DefaultDataModelImplementationDetails implements IDataModelImplementationDetails
+{
+ private ISession _session;
+
+ public DefaultDataModelImplementationDetails()
+ {
+ }
+
+ public DefaultDataModelImplementationDetails(ISession session)
+ {
+ _session = session;
+ }
+
+
+
+ @Override
+ public String getStatementSeparator()
+ {
+ if (null == _session)
+ {
+ return ";";
+ }
+ else
+ {
+ return _session.getProperties().getSQLStatementSeparator();
+ }
+ }
+}
Modified: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/SQLExecuterTask.java
===================================================================
--- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/SQLExecuterTask.java 2012-02-13 23:31:09 UTC (rev 6577)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/SQLExecuterTask.java 2012-02-15 19:54:16 UTC (rev 6578)
@@ -847,17 +847,6 @@
return _dataSetUpdateableTableModel.editModeIsForced();
}
- public IDataModelImplementationDetails getDataModelImplementationDetails()
- {
- return new IDataModelImplementationDetails()
- {
- public String getStatementSeparator()
- {
- return _session.getQueryTokenizer().getSQLStatementSeparator();
- }
- };
- }
-
//
//////////////////////////////////////////////////////////////////////////////////
Modified: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/ResultTab.java
===================================================================
--- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/ResultTab.java 2012-02-13 23:31:09 UTC (rev 6577)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/ResultTab.java 2012-02-15 19:54:16 UTC (rev 6578)
@@ -37,6 +37,7 @@
import javax.swing.event.ChangeEvent;
import javax.swing.event.ChangeListener;
+import net.sourceforge.squirrel_sql.client.session.*;
import net.sourceforge.squirrel_sql.client.session.mainpanel.overview.OverwiewCtrl;
import net.sourceforge.squirrel_sql.fw.datasetviewer.*;
import net.sourceforge.squirrel_sql.fw.gui.MultipleLineLabel;
@@ -49,9 +50,6 @@
import net.sourceforge.squirrel_sql.client.IApplication;
import net.sourceforge.squirrel_sql.client.action.SquirrelAction;
import net.sourceforge.squirrel_sql.client.gui.builders.UIFactory;
-import net.sourceforge.squirrel_sql.client.session.ISession;
-import net.sourceforge.squirrel_sql.client.session.SQLExecutionInfo;
-import net.sourceforge.squirrel_sql.client.session.EditableSqlCheck;
import net.sourceforge.squirrel_sql.client.session.properties.SessionProperties;
import net.sourceforge.squirrel_sql.fw.util.Utilities;
@@ -171,7 +169,7 @@
if (_allowEditing)
{
- _resultSetOutput = BaseDataSetViewerDestination.getInstance(props.getSQLResultsOutputClassName(), _creator);
+ _resultSetOutput = BaseDataSetViewerDestination.getInstance(props.getSQLResultsOutputClassName(), _creator, new DefaultDataModelImplementationDetails(_session));
}
else
@@ -182,7 +180,7 @@
// edited column belongs to. Therefore limit the output
// to be read-only
_resultSetOutput = BaseDataSetViewerDestination.getInstance(
- props.getReadOnlySQLResultsOutputClassName(), null);
+ props.getReadOnlySQLResultsOutputClassName(), null, new DefaultDataModelImplementationDetails(_session));
}
@@ -191,7 +189,7 @@
if (_session.getProperties().getShowResultsMetaData())
{
- _metaDataOutput = BaseDataSetViewerDestination.getInstance(props.getMetaDataOutputClassName(), null);
+ _metaDataOutput = BaseDataSetViewerDestination.getInstance(props.getMetaDataOutputClassName(), null, new DefaultDataModelImplementationDetails(_session));
_metaDataSp.setViewportView(_metaDataOutput.getComponent());
_metaDataSp.setRowHeader(null);
}
@@ -376,7 +374,7 @@
{
TableState resultSortableTableState = getTableState(_resultSetOutput);
- _resultSetOutput = BaseDataSetViewerDestination.getInstance(SessionProperties.IDataSetDestinations.EDITABLE_TABLE, _creator);
+ _resultSetOutput = BaseDataSetViewerDestination.getInstance(SessionProperties.IDataSetDestinations.EDITABLE_TABLE, _creator, new DefaultDataModelImplementationDetails(_session));
_resultSetSp.setViewportView(_resultSetOutput.getComponent());
_resultSetSp.setRowHeader(null);
_rsds.resetCursor();
@@ -399,7 +397,7 @@
TableState resultSortableTableState = getTableState(_resultSetOutput);
- _resultSetOutput = BaseDataSetViewerDestination.getInstance(readOnlyOutput, _creator);
+ _resultSetOutput = BaseDataSetViewerDestination.getInstance(readOnlyOutput, _creator, new DefaultDataModelImplementationDetails(_session));
_resultSetSp.setViewportView(_resultSetOutput.getComponent());
_resultSetSp.setRowHeader(null);
_rsds.resetCursor();
Modified: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/objecttree/tabs/BaseDataSetTab.java
===================================================================
--- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/objecttree/tabs/BaseDataSetTab.java 2012-02-13 23:31:09 UTC (rev 6577)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/objecttree/tabs/BaseDataSetTab.java 2012-02-15 19:54:16 UTC (rev 6578)
@@ -19,6 +19,7 @@
*/
import java.awt.Component;
+import net.sourceforge.squirrel_sql.client.session.DefaultDataModelImplementationDetails;
import net.sourceforge.squirrel_sql.fw.datasetviewer.DataSetException;
import net.sourceforge.squirrel_sql.fw.datasetviewer.DataSetScrollingPanel;
import net.sourceforge.squirrel_sql.fw.datasetviewer.IDataSet;
@@ -79,7 +80,7 @@
// should be no problem
}
- _comp = new DataSetScrollingPanel(getDestinationClassName(), modelReference);
+ _comp = new DataSetScrollingPanel(getDestinationClassName(), modelReference, new DefaultDataModelImplementationDetails(getSession()));
}
catch (Exception ex)
{
@@ -112,23 +113,29 @@
*/
public synchronized void refreshComponent() throws DataSetException
{
- ISession session = getSession();
+ final ISession session = getSession();
if (session == null)
{
throw new IllegalStateException("Null ISession");
}
- super._app.getThreadPool().addTask(new Runnable() {
- public void run() {
- try {
- ((DataSetScrollingPanel)getComponent()).load(createDataSet());
- } catch (DataSetException e) {
- s_log.error("", e);
- }
+
+ super._app.getThreadPool().addTask(new Runnable()
+ {
+ public void run()
+ {
+ try
+ {
+ ((DataSetScrollingPanel) getComponent()).load(createDataSet(), new DefaultDataModelImplementationDetails(session));
}
- });
-
- }
+ catch (DataSetException e)
+ {
+ s_log.error("", e);
+ }
+ }
+ });
+ }
+
protected abstract IDataSet createDataSet() throws DataSetException;
protected String getDestinationClassName()
Modified: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/objecttree/tabs/BasePreparedStatementTab.java
===================================================================
--- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/objecttree/tabs/BasePreparedStatementTab.java 2012-02-13 23:31:09 UTC (rev 6577)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/objecttree/tabs/BasePreparedStatementTab.java 2012-02-15 19:54:16 UTC (rev 6578)
@@ -25,6 +25,7 @@
import java.util.HashMap;
import java.util.Map;
+import net.sourceforge.squirrel_sql.client.session.DefaultDataModelImplementationDetails;
import net.sourceforge.squirrel_sql.fw.datasetviewer.ColumnDisplayDefinition;
import net.sourceforge.squirrel_sql.fw.datasetviewer.DataSetException;
import net.sourceforge.squirrel_sql.fw.datasetviewer.DataSetScrollingPanel;
@@ -103,7 +104,7 @@
String destClassName = props.getMetaDataOutputClassName();
try
{
- _comp = new DataSetScrollingPanel(destClassName, null);
+ _comp = new DataSetScrollingPanel(destClassName, null, new DefaultDataModelImplementationDetails(session));
} catch (Exception e)
{
s_log.error("Unexpected exception from call to getComponent: " + e.getMessage(), e);
@@ -122,21 +123,24 @@
}
PreparedStatement pstmt = null;
ResultSet rs = null;
- try
- {
- pstmt = createStatement();
- rs = pstmt.executeQuery();
- final IDataSet ds = createDataSetFromResultSet(rs);
- _comp.load(ds);
- } catch (SQLException ex)
- {
- throw new DataSetException(ex);
- } finally
- {
- SQLUtilities.closeResultSet(rs, true);
- }
- }
+ try
+ {
+ pstmt = createStatement();
+ rs = pstmt.executeQuery();
+ final IDataSet ds = createDataSetFromResultSet(rs);
+ _comp.load(ds, new DefaultDataModelImplementationDetails(session));
+ }
+ catch (SQLException ex)
+ {
+ throw new DataSetException(ex);
+ }
+ finally
+ {
+ SQLUtilities.closeResultSet(rs, true);
+ }
+ }
+
/**
* Subclasses must implement this to provide a PreparedStatement that has it's parameter values bound and
* is ready to be executed. It will be used in refreshComponent to load a DataSet into this tab.
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 2012-02-13 23:31:09 UTC (rev 6577)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/objecttree/tabs/table/ContentsTab.java 2012-02-15 19:54:16 UTC (rev 6578)
@@ -556,16 +556,6 @@
return _dataSetUpdateableTableModel.editModeIsForced();
}
- public IDataModelImplementationDetails getDataModelImplementationDetails()
- {
- return new IDataModelImplementationDetails()
- {
- public String getStatementSeparator()
- {
- return getSession().getQueryTokenizer().getSQLStatementSeparator();
- }
- };
- }
protected String getDestinationClassName()
{
Modified: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/overview/OverwiewCtrl.java
===================================================================
--- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/overview/OverwiewCtrl.java 2012-02-13 23:31:09 UTC (rev 6577)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/overview/OverwiewCtrl.java 2012-02-15 19:54:16 UTC (rev 6578)
@@ -2,6 +2,7 @@
import net.sourceforge.squirrel_sql.client.IApplication;
import net.sourceforge.squirrel_sql.client.gui.desktopcontainer.DialogWidget;
+import net.sourceforge.squirrel_sql.client.session.DefaultDataModelImplementationDetails;
import net.sourceforge.squirrel_sql.client.session.ISession;
import net.sourceforge.squirrel_sql.client.session.mainpanel.overview.datascale.*;
import net.sourceforge.squirrel_sql.fw.datasetviewer.*;
@@ -24,9 +25,11 @@
private OverviewHolder _overviewHolder = new OverviewHolder();
private OverwiewPanel _overwiewPanel;
private IApplication _app;
+ private ISession _session;
public OverwiewCtrl(final ISession session)
{
+ _session = session;
_app = session.getApplication();
_overwiewPanel = new OverwiewPanel(_app.getResources());
@@ -141,7 +144,7 @@
OverviewDataSet ods = new OverviewDataSet(allRows, columnDisplayDefinitions);
DataSetViewerTablePanel dsv = new DataSetViewerTablePanel();
- dsv.init(null);
+ dsv.init(null, new DefaultDataModelImplementationDetails(_session));
dsv.show(ods);
return dsv;
}
Modified: trunk/sql12/doc/src/main/resources/changes.txt
===================================================================
--- trunk/sql12/doc/src/main/resources/changes.txt 2012-02-13 23:31:09 UTC (rev 6577)
+++ trunk/sql12/doc/src/main/resources/changes.txt 2012-02-15 19:54:16 UTC (rev 6578)
@@ -9,6 +9,10 @@
Enhancements:
+Copy as INSERT-VALUES statement now works on almost any table not just on editable tables. If a table isn't in
+ a Session scope ";" is used as statement separator instead of the separator defined in Session properties.
+
+
Swing Violation Detector Plugin:
This new plugin will help to detect rule violations of the Swing programming model. The usage of this plugin is only recommonend for
testers and developers.
Modified: trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/datasetviewer/BaseDataSetViewerDestination.java
===================================================================
--- trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/datasetviewer/BaseDataSetViewerDestination.java 2012-02-13 23:31:09 UTC (rev 6577)
+++ trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/datasetviewer/BaseDataSetViewerDestination.java 2012-02-15 19:54:16 UTC (rev 6578)
@@ -48,25 +48,29 @@
protected DefaultCellEditor currentCellEditor = null;
- /**
- * Some types of DataSetViewers require extra initialization to set up
- * a return reference to the originating data object (e.g. to allow
- * editing of that object later). The reference is needed to distinguish
- * which tables/text may be edited and which may not. This cannot be included
- * in the object creation because the Class.newInstance() method used in the
- * getInstance() method of this class does not allow for arguments. Since this
- * info is needed for the DataSetViewerTablePanel and DataSetViewerTextPanel classes
- * to be able to set up the
- * popup menu correctly, those classes cannot complete their initialization without
- * this added info. Therefore we need to initialize that class in two stages.
- */
public void init(IDataSetUpdateableModel updateableObject)
{
- // default is to do nothing. Derived classes must override this
- // to accomplish anything.
+ init(updateableObject, null);
}
- /**
+ /**
+ * Some types of DataSetViewers require extra initialization to set up
+ * a return reference to the originating data object (e.g. to allow
+ * editing of that object later). The reference is needed to distinguish
+ * which tables/text may be edited and which may not. This cannot be included
+ * in the object creation because the Class.newInstance() method used in the
+ * getInstance() method of this class does not allow for arguments. Since this
+ * info is needed for the DataSetViewerTablePanel and DataSetViewerTextPanel classes
+ * to be able to set up the
+ * popup menu correctly, those classes cannot complete their initialization without
+ * this added info. Therefore we need to initialize that class in two stages.
+ */
+ @Override
+ public void init(IDataSetUpdateableModel updateableModel, IDataModelImplementationDetails dataModelImplementationDetails)
+ {
+ }
+
+ /**
* Specify the column definitions to use.
*
* @param hdgs Column definitions to use.
@@ -173,20 +177,25 @@
protected abstract void allRowsAdded() throws DataSetException;
protected abstract void addRow(Object[] row) throws DataSetException;
+
+ public static IDataSetViewer getInstance(String sName, IDataSetUpdateableModel updateableModel)
+ {
+ return getInstance(sName, updateableModel, null);
+ }
+
/**
* factory method for getting IDataSetViewer instances
* If no instance can be made then the default
* will be returned.
*/
- public static IDataSetViewer getInstance(String sName,
- IDataSetUpdateableModel updateableModel)
+ public static IDataSetViewer getInstance(String sName, IDataSetUpdateableModel updateableModel, IDataModelImplementationDetails dataModelImplementationDetails)
{
IDataSetViewer dsv = null;
try
{
Class<?> cls = Class.forName(sName);
dsv = (IDataSetViewer) cls.newInstance();
- dsv.init(updateableModel);
+ dsv.init(updateableModel, dataModelImplementationDetails);
}
catch (Exception e)
{
@@ -195,7 +204,7 @@
if (dsv == null)
{
dsv = new DataSetViewerTablePanel();
- ((DataSetViewerTablePanel)dsv).init(updateableModel);
+ dsv.init(updateableModel, dataModelImplementationDetails);
}
return dsv;
}
Modified: trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/datasetviewer/DataSetScrollingPanel.java
===================================================================
--- trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/datasetviewer/DataSetScrollingPanel.java 2012-02-13 23:31:09 UTC (rev 6577)
+++ trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/datasetviewer/DataSetScrollingPanel.java 2012-02-15 19:54:16 UTC (rev 6578)
@@ -41,12 +41,16 @@
super();
}
- public DataSetScrollingPanel(String destClassName,
- IDataSetUpdateableModel updateableModel)
+ public DataSetScrollingPanel(String destClassName, IDataSetUpdateableModel updateableModel)
throws DataSetException
{
- super();
- createUserInterface(destClassName, updateableModel);
+ this(destClassName, updateableModel, null);
+ }
+
+ public DataSetScrollingPanel(String destClassName, IDataSetUpdateableModel updateableModel, IDataModelImplementationDetails dataModelImplementationDetails)
+ throws DataSetException
+ {
+ createUserInterface(destClassName, updateableModel, dataModelImplementationDetails);
_fullyCreated = true;
}
@@ -55,16 +59,18 @@
load(ds, null);
}
- /**
- * @deprecated
- */
- public void load(IDataSet ds, String destClassName)
+ public void load(IDataSet ds, IDataModelImplementationDetails dataModelImplementationDetails)
{
+ load(ds, null, dataModelImplementationDetails);
+ }
+
+ private void load(IDataSet ds, String destClassName, IDataModelImplementationDetails dataModelImplementationDetails)
+ {
try
{
if (!_fullyCreated)
{
- createUserInterface(destClassName, null);
+ createUserInterface(destClassName, null, dataModelImplementationDetails);
_fullyCreated = true;
}
Runnable run = new UIUpdater(_viewer, ds);
@@ -84,11 +90,11 @@
}
}
- private void createUserInterface(String destClassName, IDataSetUpdateableModel updateableModel)
+ private void createUserInterface(String destClassName, IDataSetUpdateableModel updateableModel, IDataModelImplementationDetails dataModelImplementationDetails)
throws DataSetException
{
setBorder(BorderFactory.createEmptyBorder());
- _viewer = BaseDataSetViewerDestination.getInstance(destClassName, updateableModel);
+ _viewer = BaseDataSetViewerDestination.getInstance(destClassName, updateableModel, dataModelImplementationDetails);
Runnable run = new Runnable()
{
public void run()
Modified: trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/datasetviewer/DataSetViewerEditableTablePanel.java
===================================================================
--- trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/datasetviewer/DataSetViewerEditableTablePanel.java 2012-02-13 23:31:09 UTC (rev 6577)
+++ trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/datasetviewer/DataSetViewerEditableTablePanel.java 2012-02-15 19:54:16 UTC (rev 6578)
@@ -50,9 +50,9 @@
/**
* Internal definitions
*/
- public void init(IDataSetUpdateableModel updateableModel)
+ public void init(IDataSetUpdateableModel updateableModel, IDataModelImplementationDetails dataModelImplementationDetails)
{
- super.init(updateableModel);
+ super.init(updateableModel, dataModelImplementationDetails);
setUpdateableModelReference(updateableModel);
}
@@ -102,7 +102,7 @@
{
// we need to table column model to be able to add CellEditors to the
// individual columns
- cellPopupMenu = new TablePopupMenu(getUpdateableModel(), this, table);
+ cellPopupMenu = new TablePopupMenu(getUpdateableModel(), this, table, getDataModelImplementationDetails());
for (int i=0; i < _colDefs.length; i++) {
// use factory to get the appropriate editor
Modified: trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/datasetviewer/DataSetViewerTablePanel.java
===================================================================
--- trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/datasetviewer/DataSetViewerTablePanel.java 2012-02-13 23:31:09 UTC (rev 6577)
+++ trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/datasetviewer/DataSetViewerTablePanel.java 2012-02-15 19:54:16 UTC (rev 6578)
@@ -66,7 +66,17 @@
private IDataSetUpdateableModel _updateableModel;
private DataSetViewerTableListSelectionHandler _selectionHandler;
- public DataSetViewerTablePanel()
+ private IDataModelImplementationDetails _dataModelImplementationDetails =
+ new IDataModelImplementationDetails()
+ {
+ @Override
+ public String getStatementSeparator()
+ {
+ return ";";
+ }
+ };
+
+ public DataSetViewerTablePanel()
{
super();
}
@@ -79,17 +89,40 @@
public void init(IDataSetUpdateableModel updateableModel, int listSelectionMode)
{
- _table = new MyJTable(this, updateableModel, listSelectionMode);
+ init(updateableModel, listSelectionMode, null);
+ }
+
+ public void init(IDataSetUpdateableModel updateableModel, IDataModelImplementationDetails dataModelImplementationDetails)
+ {
+ init(updateableModel, ListSelectionModel.SINGLE_INTERVAL_SELECTION, dataModelImplementationDetails);
+ }
+
+ public void init(IDataSetUpdateableModel updateableModel, int listSelectionMode, IDataModelImplementationDetails dataModelImplementationDetails)
+ {
+ if (null != dataModelImplementationDetails)
+ {
+ _dataModelImplementationDetails = dataModelImplementationDetails;
+ }
+
+ _table = new MyJTable(this, updateableModel, listSelectionMode);
_selectionHandler = new DataSetViewerTableListSelectionHandler(_table);
- _updateableModel = updateableModel;
- }
+ _updateableModel = updateableModel;
+
+
+ }
+
public IDataSetUpdateableModel getUpdateableModel()
{
return _updateableModel;
}
- public void clear()
+ public IDataModelImplementationDetails getDataModelImplementationDetails()
+ {
+ return _dataModelImplementationDetails;
+ }
+
+ public void clear()
{
_typedModel.clear();
_typedModel.fireTableDataChanged();
@@ -539,8 +572,7 @@
setTableHeader(_tableHeader);
_tableHeader.setTable(this);
- _tablePopupMenu = new TablePopupMenu(allowUpdate, updateableObject,
- DataSetViewerTablePanel.this);
+ _tablePopupMenu = new TablePopupMenu(allowUpdate, updateableObject, DataSetViewerTablePanel.this, getDataModelImplementationDetails());
_tablePopupMenu.setTable(this);
addMouseListener(new MouseAdapter()
Modified: trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/datasetviewer/IDataSetUpdateableModel.java
===================================================================
--- trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/datasetviewer/IDataSetUpdateableModel.java 2012-02-13 23:31:09 UTC (rev 6577)
+++ trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/datasetviewer/IDataSetUpdateableModel.java 2012-02-15 19:54:16 UTC (rev 6578)
@@ -63,7 +63,4 @@
* or not.
*/
public boolean editModeIsForced();
-
- public IDataModelImplementationDetails getDataModelImplementationDetails();
-
}
Modified: trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/datasetviewer/IDataSetViewer.java
===================================================================
--- trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/datasetviewer/IDataSetViewer.java 2012-02-13 23:31:09 UTC (rev 6577)
+++ trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/datasetviewer/IDataSetViewer.java 2012-02-15 19:54:16 UTC (rev 6578)
@@ -32,8 +32,11 @@
/**
* Allow some DataSetViewers to complete their initialization.
*/
- public void init(IDataSetUpdateableModel updateableObject);
+ void init(IDataSetUpdateableModel updateableObject);
+ void init(IDataSetUpdateableModel updateableModel, IDataModelImplementationDetails dataModelImplementationDetails);
+
+
/**
* Get the rowcount of the DataSet
*/
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 2012-02-13 23:31:09 UTC (rev 6577)
+++ trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/gui/TablePopupMenu.java 2012-02-15 19:54:16 UTC (rev 6578)
@@ -26,6 +26,7 @@
import javax.swing.*;
+import net.sourceforge.squirrel_sql.fw.datasetviewer.IDataModelImplementationDetails;
import net.sourceforge.squirrel_sql.fw.gui.action.*;
import net.sourceforge.squirrel_sql.fw.gui.action.exportData.ExportDataException;
import net.sourceforge.squirrel_sql.fw.gui.action.wikiTable.CopyWikiTableActionFactory;
@@ -105,7 +106,8 @@
// to tell the application to set up an editable display panel
private IDataSetUpdateableModel _updateableModel = null;
- // pointer to the viewer
+ private IDataModelImplementationDetails _dataModelImplementationDetails;
+ // pointer to the viewer
// This is needed for insert and delete operations
private DataSetViewerTablePanel _viewer = null;
@@ -120,12 +122,15 @@
*/
public TablePopupMenu(boolean allowEditing,
IDataSetUpdateableModel updateableModel,
- DataSetViewerTablePanel viewer)
+ DataSetViewerTablePanel viewer,
+ IDataModelImplementationDetails dataModelImplementationDetails)
{
super();
// save the pointer needed to enable editing of data on-demand
_updateableModel = updateableModel;
+ _dataModelImplementationDetails = dataModelImplementationDetails;
+
// save the pointer needed for insert and delete operations
_viewer = viewer;
@@ -144,9 +149,7 @@
_menuItems[IOptionTypes.COPY_IN_STATEMENT] = add(_copyInStatement);
_menuItems[IOptionTypes.COPY_WHERE_STATEMENT] = add(_copyWhereStatement);
_menuItems[IOptionTypes.COPY_UPDATE_STATEMENT] = add(_copyUpdateStatement);
- if (_updateableModel != null) {
- _menuItems[IOptionTypes.COPY_INSERT_STATEMENT] = add(_copyInsertStatement);
- }
+ _menuItems[IOptionTypes.COPY_INSERT_STATEMENT] = add(_copyInsertStatement);
addSeparator();
_menuItems[IOptionTypes.EXPORT_CSV] = add(_exportCvs);
addSeparator();
@@ -197,13 +200,14 @@
* Constructor used when creating menu for use in cell editor.
*/
public TablePopupMenu(IDataSetUpdateableModel updateableModel,
- DataSetViewerTablePanel viewer, JTable table)
+ DataSetViewerTablePanel viewer, JTable table, IDataModelImplementationDetails dataModelImplementationDetails)
{
super();
// save the pointer needed to enable editing of data on-demand
_updateableModel = updateableModel;
+ _dataModelImplementationDetails = dataModelImplementationDetails;
- // save the pointer needed for insert and delete operations
+ // save the pointer needed for insert and delete operations
_viewer = viewer;
_table = table;
@@ -262,7 +266,7 @@
private String getStatementSeparatorFromModel()
{
- return _updateableModel.getDataModelImplementationDetails().getStatementSeparator();
+ return _dataModelImplementationDetails.getStatementSeparator();
}
Modified: trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/link/LinkGraphDialog.java
===================================================================
--- trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/link/LinkGraphDialog.java 2012-02-13 23:31:09 UTC (rev 6577)
+++ trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/link/LinkGraphDialog.java 2012-02-15 19:54:16 UTC (rev 6578)
@@ -1,6 +1,7 @@
package net.sourceforge.squirrel_sql.plugins.graph.link;
import com.jidesoft.swing.MultilineLabel;
+import net.sourceforge.squirrel_sql.client.session.DefaultDataModelImplementationDetails;
import net.sourceforge.squirrel_sql.client.session.ISession;
import net.sourceforge.squirrel_sql.fw.datasetviewer.DataSetViewerTablePanel;
import net.sourceforge.squirrel_sql.fw.gui.GUIUtils;
@@ -58,7 +59,7 @@
gbc = new GridBagConstraints(0, 4, 1, 1, 1, 1, GridBagConstraints.NORTHWEST, GridBagConstraints.BOTH, new Insets(5, 5, 5, 5), 0, 0);
tblGraphFiles = new DataSetViewerTablePanel();
- tblGraphFiles.init(null, ListSelectionModel.MULTIPLE_INTERVAL_SELECTION);
+ tblGraphFiles.init(null, ListSelectionModel.MULTIPLE_INTERVAL_SELECTION, new DefaultDataModelImplementationDetails(session));
content.add(new JScrollPane(tblGraphFiles.getComponent()), gbc);
gbc = new GridBagConstraints(0, 5, 1, 1, 1, 1, GridBagConstraints.NORTHWEST, GridBagConstraints.HORIZONTAL, new Insets(5, 5, 5, 5), 0, 0);
Modified: trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/nondbconst/ConfigureNonDbConstraintDlg.java
===================================================================
--- trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/nondbconst/ConfigureNonDbConstraintDlg.java 2012-02-13 23:31:09 UTC (rev 6577)
+++ trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/nondbconst/ConfigureNonDbConstraintDlg.java 2012-02-15 19:54:16 UTC (rev 6578)
@@ -1,5 +1,6 @@
package net.sourceforge.squirrel_sql.plugins.graph.nondbconst;
+import net.sourceforge.squirrel_sql.client.session.DefaultDataModelImplementationDetails;
import net.sourceforge.squirrel_sql.fw.util.StringManager;
import net.sourceforge.squirrel_sql.fw.util.StringManagerFactory;
import net.sourceforge.squirrel_sql.fw.gui.GUIUtils;
Modified: trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/mapping/DetailPanel.java
===================================================================
--- trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/mapping/DetailPanel.java 2012-02-13 23:31:09 UTC (rev 6577)
+++ trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/mapping/DetailPanel.java 2012-02-15 19:54:16 UTC (rev 6578)
@@ -1,5 +1,7 @@
package net.sourceforge.squirrel_sql.plugins.hibernate.mapping;
+import net.sourceforge.squirrel_sql.client.session.DefaultDataModelImplementationDetails;
+import net.sourceforge.squirrel_sql.client.session.ISession;
import net.sourceforge.squirrel_sql.fw.datasetviewer.DataSetViewerTablePanel;
import javax.swing.*;
@@ -9,12 +11,12 @@
{
DataSetViewerTablePanel tblDetails;
- public DetailPanel()
+ public DetailPanel(ISession session)
{
super(new GridLayout(1,1));
tblDetails = new DataSetViewerTablePanel();
- tblDetails.init(null);
+ tblDetails.init(null, new DefaultDataModelImplementationDetails(session));
add(new JScrollPane(tblDetails.getComponent()));
}
Modified: trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/mapping/DetailPanelController.java
===================================================================
--- trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/mapping/DetailPanelController.java 2012-02-13 23:31:09 UTC (rev 6577)
+++ trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/mapping/DetailPanelController.java 2012-02-15 19:54:16 UTC (rev 6578)
@@ -1,5 +1,6 @@
package net.sourceforge.squirrel_sql.plugins.hibernate.mapping;
+import net.sourceforge.squirrel_sql.client.session.ISession;
import net.sourceforge.squirrel_sql.fw.datasetviewer.EmptyDataSet;
import net.sourceforge.squirrel_sql.fw.datasetviewer.DataSetException;
import net.sourceforge.squirrel_sql.fw.datasetviewer.HashtableDataSet;
@@ -11,9 +12,9 @@
private DetailPanel _detailPanel;
- public DetailPanelController()
+ public DetailPanelController(ISession session)
{
- _detailPanel = new DetailPanel();
+ _detailPanel = new DetailPanel(session);
}
public JComponent getDetailComponent()
Modified: trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/mapping/MappedObjectPanelManager.java
===================================================================
--- trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/mapping/MappedObjectPanelManager.java 2012-02-13 23:31:09 UTC (rev 6577)
+++ trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/mapping/MappedObjectPanelManager.java 2012-02-15 19:54:16 UTC (rev 6578)
@@ -41,7 +41,7 @@
_session = session;
- _detailPanelController = new DetailPanelController();
+ _detailPanelController = new DetailPanelController(_session);
_panel = new MappedObjectPanel(_detailPanelController.getDetailComponent());
Modified: trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/viewobjects/SingleResultController.java
===================================================================
--- trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/viewobjects/SingleResultController.java 2012-02-13 23:31:09 UTC (rev 6577)
+++ trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/viewobjects/SingleResultController.java 2012-02-15 19:54:16 UTC (rev 6578)
@@ -1,6 +1,7 @@
package net.sourceforge.squirrel_sql.plugins.hibernate.viewobjects;
import net.sourceforge.squirrel_sql.client.gui.builders.UIFactory;
+import net.sourceforge.squirrel_sql.client.session.DefaultDataModelImplementationDetails;
import net.sourceforge.squirrel_sql.client.session.ISession;
import net.sourceforge.squirrel_sql.client.session.properties.SessionProperties;
import net.sourceforge.squirrel_sql.fw.datasetviewer.DataSetException;
@@ -33,10 +34,10 @@
DetailAttribute[] attributes = DetailAttribute.createDetailtAttributes(singleType.getMappedClassInfo().getAttributes());
- _tblDetailsData.init(null);
+ _tblDetailsData.init(null, new DefaultDataModelImplementationDetails(session));
_tblDetailsData.show(new ResultDataSet(singleType));
- _tblDetailsMetaData.init(null);
+ _tblDetailsMetaData.init(null, new DefaultDataModelImplementationDetails(session));
_tblDetailsMetaData.show(new DetailAttributeDataSet(attributes));
pnlResults.removeAll();
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|