You can subscribe to this list here.
| 2004 |
Jan
|
Feb
|
Mar
|
Apr
(121) |
May
(188) |
Jun
(134) |
Jul
(115) |
Aug
(201) |
Sep
(22) |
Oct
(22) |
Nov
(15) |
Dec
(32) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2005 |
Jan
(20) |
Feb
(4) |
Mar
(1) |
Apr
(84) |
May
(107) |
Jun
(101) |
Jul
(131) |
Aug
(66) |
Sep
(55) |
Oct
(189) |
Nov
(164) |
Dec
(60) |
| 2006 |
Jan
(75) |
Feb
(107) |
Mar
(117) |
Apr
(115) |
May
(91) |
Jun
(91) |
Jul
(225) |
Aug
(151) |
Sep
(117) |
Oct
(165) |
Nov
(263) |
Dec
(233) |
| 2007 |
Jan
(244) |
Feb
(116) |
Mar
(185) |
Apr
(263) |
May
(149) |
Jun
(292) |
Jul
(260) |
Aug
(306) |
Sep
(130) |
Oct
(61) |
Nov
(103) |
Dec
(144) |
| 2008 |
Jan
(112) |
Feb
(55) |
Mar
(116) |
Apr
(76) |
May
(69) |
Jun
(130) |
Jul
(75) |
Aug
(56) |
Sep
(76) |
Oct
(87) |
Nov
(403) |
Dec
(410) |
| 2009 |
Jan
(132) |
Feb
(168) |
Mar
(197) |
Apr
(67) |
May
(8) |
Jun
(44) |
Jul
(144) |
Aug
(126) |
Sep
(88) |
Oct
(3) |
Nov
(81) |
Dec
(97) |
| 2010 |
Jan
(238) |
Feb
(41) |
Mar
(61) |
Apr
(37) |
May
(31) |
Jun
(22) |
Jul
(92) |
Aug
(105) |
Sep
(46) |
Oct
(45) |
Nov
(55) |
Dec
(92) |
| 2011 |
Jan
(51) |
Feb
(21) |
Mar
(57) |
Apr
(20) |
May
(32) |
Jun
(29) |
Jul
(26) |
Aug
(50) |
Sep
(59) |
Oct
(25) |
Nov
(79) |
Dec
(2) |
| 2012 |
Jan
(14) |
Feb
(31) |
Mar
(11) |
Apr
(9) |
May
(13) |
Jun
(9) |
Jul
(6) |
Aug
(12) |
Sep
(16) |
Oct
(37) |
Nov
(12) |
Dec
(7) |
| 2013 |
Jan
(9) |
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: <ger...@us...> - 2012-01-23 18:53:20
|
Revision: 6562
http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=6562&view=rev
Author: gerdwagner
Date: 2012-01-23 18:53:11 +0000 (Mon, 23 Jan 2012)
Log Message:
-----------
Hibernate Plugin: On Windows the class path's files defined in the Hibernate configuration would remain locked even after disconnecting Hibernate. This doesn't happen anymore when Hibernate is run in its own process.
Modified Paths:
--------------
trunk/sql12/doc/src/main/resources/changes.txt
trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/HibernateConnection.java
trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/HibernateConnectionFactory.java
trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/server/HibernateServerConnection.java
trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/server/HibernateServerConnectionImpl.java
trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/server/HqlQueryResult.java
trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/server/IntraVmConnectionFactory.java
trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/server/RCParam.java
trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/server/ReflectionCaller.java
trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/server/ServerMainImpl.java
trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/util/HqlQueryErrorUtil.java
trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/viewobjects/CommandLineOutput.java
trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/viewobjects/HibernatePropertyReader.java
trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/viewobjects/ObjectResultController.java
trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/viewobjects/ObjectResultTabController.java
trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/viewobjects/PersistentCollectionResult.java
trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/viewobjects/PrimitiveValue.java
trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/viewobjects/QueryListCreator.java
trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/viewobjects/ResultDataSet.java
trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/viewobjects/ResultsController.java
trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/viewobjects/RootResultController.java
trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/viewobjects/RootType.java
trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/viewobjects/SingleResult.java
trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/viewobjects/SingleType.java
trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/viewobjects/TupelResult.java
trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/viewobjects/TupelResultController.java
trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/viewobjects/TupelType.java
trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/viewobjects/ViewObjectsUtil.java
Added Paths:
-----------
trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/server/ObjectSubstitute.java
trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/server/ObjectSubstituteFactory.java
trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/server/ObjectSubstituteRoot.java
trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/server/PropertyAccessor.java
trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/server/PropertySubstitute.java
trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/server/SquirrelHibernateServerException.java
Removed Paths:
-------------
trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/server/HibernateProxyHandler.java
trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/viewobjects/PropertyAccessor.java
Modified: trunk/sql12/doc/src/main/resources/changes.txt
===================================================================
--- trunk/sql12/doc/src/main/resources/changes.txt 2012-01-23 18:42:15 UTC (rev 6561)
+++ trunk/sql12/doc/src/main/resources/changes.txt 2012-01-23 18:53:11 UTC (rev 6562)
@@ -6,6 +6,11 @@
Enhancements:
+Hibernate Plugin:
+ On Windows the class path's files defined in the Hibernate configuration would remain locked even
+ after disconnecting Hibernate. This doesn't happen anymore when Hibernate is run in its own process.
+
+
Graph Plugin:
Tables can be added to a Graph from within the SQL-Editor (accessible from right mouse menu and tools popup).
Modified: trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/HibernateConnection.java
===================================================================
--- trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/HibernateConnection.java 2012-01-23 18:42:15 UTC (rev 6561)
+++ trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/HibernateConnection.java 2012-01-23 18:53:11 UTC (rev 6562)
@@ -151,19 +151,6 @@
}
- public Class getPersistenCollectionClass()
- {
- try
- {
- return _hibernateServerConnection.getPersistenCollectionClass();
- }
- catch (Exception e)
- {
- throw new RuntimeException(e);
-
- }
- }
-
public HibernateSqlConnectionData getHibernateSqlConnectionData()
{
try
Modified: trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/HibernateConnectionFactory.java
===================================================================
--- trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/HibernateConnectionFactory.java 2012-01-23 18:42:15 UTC (rev 6561)
+++ trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/HibernateConnectionFactory.java 2012-01-23 18:53:11 UTC (rev 6562)
@@ -26,7 +26,7 @@
else
{
final IntraVmConnectionFactory intraVmConnectionFactory = new IntraVmConnectionFactory();
- return new HibernateConnection(intraVmConnectionFactory.createHibernateConnection(cfg), false, null, cfg.isEndProcessOnDisconnect());
+ return new HibernateConnection(intraVmConnectionFactory.createHibernateConnection(cfg, false), false, null, cfg.isEndProcessOnDisconnect());
}
}
Deleted: trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/server/HibernateProxyHandler.java
===================================================================
--- trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/server/HibernateProxyHandler.java 2012-01-23 18:42:15 UTC (rev 6561)
+++ trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/server/HibernateProxyHandler.java 2012-01-23 18:53:11 UTC (rev 6562)
@@ -1,104 +0,0 @@
-package net.sourceforge.squirrel_sql.plugins.hibernate.server;
-
-import java.lang.reflect.Field;
-import java.util.Collection;
-import java.util.HashSet;
-
-
-/**
- * Needed to remove lazy loading non collection proxies. These proxies caused serialization
- * problems when transferred from the external hibernate process.
- */
-public class HibernateProxyHandler
-{
- private ClassLoader _cl;
- private ReflectionCaller _rc;
-
- public HibernateProxyHandler(ClassLoader cl)
- {
- _cl = cl;
- _rc = new ReflectionCaller();
- }
-
-
- public void prepareHibernateProxies(Collection col, HashSet<String> mappedClassNames)
- {
- HashSet doneObjs = new HashSet();
- _prepareHibernateProxiesForCollection(col, mappedClassNames, doneObjs, true);
- }
-
- private void _prepareHibernateProxiesForCollection(Collection col, HashSet<String> mappedClassNames, HashSet doneObjs, boolean isQueryList)
- {
- try
- {
- if (null == col)
- {
- return;
- }
-
- boolean isInitialized = isQueryList ||
- (Boolean) _rc.callStaticMethod(_cl, "org.hibernate.Hibernate", "isInitialized", new Class[]{Object.class}, new Object[]{col}).getCallee();
-
- if (isInitialized)
- {
- for (Object o : col)
- {
- if(o instanceof Object[])
- {
- Object[] arr = (Object[]) o;
- for (Object entry : arr)
- {
- _prepareHibernateProxies(entry, mappedClassNames, doneObjs);
- }
- }
- else
- {
- _prepareHibernateProxies(o, mappedClassNames, doneObjs);
- }
- }
- }
- }
- catch (Exception e)
- {
- throw new RuntimeException(e);
- }
- }
-
- private void _prepareHibernateProxies(Object o, HashSet<String> mappedClassNames, HashSet doneObjs) throws IllegalAccessException
- {
- if (null == o || doneObjs.contains(o))
- {
- return;
- }
-
- doneObjs.add(o);
-
- Field[] declaredFields = o.getClass().getDeclaredFields();
-
- for (Field declaredField : declaredFields)
- {
- if (mappedClassNames.contains(declaredField.getType().getName()))
- {
- declaredField.setAccessible(true);
- Object fielddObj = declaredField.get(o);
- if (null != fielddObj)
- {
- if (-1 < fielddObj.getClass().getName().indexOf('$'))
- {
- declaredField.set(o, null);
- }
- else
- {
- _prepareHibernateProxies(fielddObj, mappedClassNames, doneObjs);
- }
- }
- }
- else if (Collection.class.isAssignableFrom(declaredField.getType()))
- {
- declaredField.setAccessible(true);
- Object fielddObj = declaredField.get(o);
- _prepareHibernateProxiesForCollection((Collection) fielddObj, mappedClassNames, doneObjs, false);
- }
- }
- }
-}
Modified: trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/server/HibernateServerConnection.java
===================================================================
--- trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/server/HibernateServerConnection.java 2012-01-23 18:42:15 UTC (rev 6561)
+++ trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/server/HibernateServerConnection.java 2012-01-23 18:53:11 UTC (rev 6562)
@@ -17,10 +17,6 @@
throws RemoteException;
- Class getPersistenCollectionClass()
- throws RemoteException;
-
-
HibernateSqlConnectionData getHibernateSqlConnectionData()
throws RemoteException;
Modified: trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/server/HibernateServerConnectionImpl.java
===================================================================
--- trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/server/HibernateServerConnectionImpl.java 2012-01-23 18:42:15 UTC (rev 6561)
+++ trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/server/HibernateServerConnectionImpl.java 2012-01-23 18:53:11 UTC (rev 6562)
@@ -1,5 +1,7 @@
package net.sourceforge.squirrel_sql.plugins.hibernate.server;
+import java.io.PrintWriter;
+import java.io.StringWriter;
import java.rmi.RemoteException;
import java.sql.Connection;
import java.sql.DatabaseMetaData;
@@ -10,15 +12,22 @@
{
private Object _sessionFactoryImpl;
private ClassLoader _cl;
- private ArrayList<MappedClassInfoData> _mappedClassInfoData;
+ private boolean _server;
+
+// private ArrayList<MappedClassInfoData> _mappedClassInfoData;
+// private HashSet<String> _mappedClassNames;
+
+ private HashMap<String, MappedClassInfoData> _infoDataByClassName;
+
+
private ReflectionCaller m_rcHibernateSession;
- private HashSet<String> _mappedClassNames;
- HibernateServerConnectionImpl(Object sessionFactoryImpl, ClassLoader cl) throws RemoteException
+ HibernateServerConnectionImpl(Object sessionFactoryImpl, ClassLoader cl, boolean isServer) throws RemoteException
{
_sessionFactoryImpl = sessionFactoryImpl;
_cl = cl;
+ _server = isServer;
}
@@ -76,7 +85,7 @@
{
_sessionFactoryImpl = null;
_cl = null;
- _mappedClassInfoData = null;
+ _infoDataByClassName = null;
System.gc();
if(null != reThrow)
@@ -90,31 +99,17 @@
public ArrayList<MappedClassInfoData> getMappedClassInfoData()
{
initMappedClassInfos();
- return _mappedClassInfoData;
+ return new ArrayList<MappedClassInfoData>(_infoDataByClassName.values());
}
- @Override
- public Class getPersistenCollectionClass()
- {
- try
- {
- return _cl.loadClass("org.hibernate.collection.PersistentCollection");
- }
- catch (ClassNotFoundException e)
- {
- throw new RuntimeException(e);
- }
- }
-
private void initMappedClassInfos()
{
- if(null != _mappedClassInfoData)
+ if(null != _infoDataByClassName)
{
return;
}
- _mappedClassInfoData = new ArrayList<MappedClassInfoData>();
- _mappedClassNames = new HashSet<String>();
+ _infoDataByClassName = new HashMap<String, MappedClassInfoData>();
ReflectionCaller sessionFactoryImplcaller = new ReflectionCaller(_sessionFactoryImpl);
Collection<ReflectionCaller> persisters = sessionFactoryImplcaller.callMethod("getAllClassMetadata").callCollectionMethod("values");
@@ -171,12 +166,11 @@
}
else
{
- throw e;
+ throw (RuntimeException)prepareTransport(e);
}
}
}
- _mappedClassInfoData.add(new MappedClassInfoData(mappedClass.getName(), tableName, identifierPropInfo, infos));
- _mappedClassNames.add(mappedClass.getName());
+ _infoDataByClassName.put(mappedClass.getName(), new MappedClassInfoData(mappedClass.getName(), tableName, identifierPropInfo, infos));
}
}
@@ -201,13 +195,15 @@
{
HqlQueryResult ret = new HqlQueryResult();
+ List queryResList = null;
+
try
{
getRcHibernateSession().callMethod("getTransaction").callMethod("begin");
}
catch (Throwable t)
{
- ret.putSessionAdminException("Exception occurced during call of Session.getTransaction().begin()", t);
+ ret.putSessionAdminException("Exception occurced during call of Session.getTransaction().begin()", prepareTransport(t));
}
try
@@ -219,11 +215,11 @@
rc = rc.callMethod("setMaxResults", new RCParam().add(sqlNbrRowsToShow, Integer.TYPE));
}
- ret.setQueryResultList((List) rc.callMethod("list").getCallee());
+ queryResList = (List) rc.callMethod("list").getCallee();
}
catch (Throwable t)
{
- ret.setExceptionOccuredWhenExecutingQuery(t);
+ ret.setExceptionOccuredWhenExecutingQuery(prepareTransport(t));
}
try
@@ -232,7 +228,7 @@
}
catch (Throwable t)
{
- ret.putSessionAdminException("Exception occurced during call of Session.getTransaction().rollback()", t);
+ ret.putSessionAdminException("Exception occurced during call of Session.getTransaction().rollback()", prepareTransport(t));
}
try
@@ -241,18 +237,40 @@
}
catch (Throwable t)
{
- ret.putSessionAdminException("Exception occurced during call of Session.clear()", t);
+ ret.putSessionAdminException("Exception occurced during call of Session.clear()", prepareTransport(t));
}
- if (null != ret.getQueryResultList())
+ if (null != queryResList)
{
- new HibernateProxyHandler(_cl).prepareHibernateProxies(ret.getQueryResultList(), _mappedClassNames);
+ ret.setQueryResultList(
+ new ObjectSubstituteFactory(_cl).replaceObjectsWithSubstitutes(queryResList, _infoDataByClassName));
}
return ret;
}
+ private Throwable prepareTransport(Throwable t)
+ {
+ if(false == _server)
+ {
+ return t;
+ }
+ StringWriter sw = new StringWriter();
+ PrintWriter pw = new PrintWriter(sw);
+
+ Throwable deepestThrowable = getDeepestThrowable(t);
+ deepestThrowable.printStackTrace(pw);
+
+ pw.flush();
+ sw.flush();
+
+ String messageIncludingOriginalStackTrace = "Exception occured on Hibernate Server Process: " + t.getMessage() + "\n" + sw.toString();
+
+ return new SquirrelHibernateServerException(messageIncludingOriginalStackTrace, deepestThrowable.getMessage(), deepestThrowable.getClass().getName());
+ }
+
+
private ReflectionCaller getRcHibernateSession()
{
if(null == m_rcHibernateSession)
@@ -277,6 +295,4 @@
return parent;
}
-
-
}
Modified: trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/server/HqlQueryResult.java
===================================================================
--- trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/server/HqlQueryResult.java 2012-01-23 18:42:15 UTC (rev 6561)
+++ trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/server/HqlQueryResult.java 2012-01-23 18:53:11 UTC (rev 6562)
@@ -6,7 +6,7 @@
public class HqlQueryResult implements Serializable
{
- private List _queryResultList;
+ private List<ObjectSubstituteRoot> _queryResultList;
private Throwable _exceptionOccuredWhenExecutingQuery;
private HashMap<String, Throwable> _sessionAdminExceptions = new HashMap<String, Throwable>();
@@ -16,12 +16,12 @@
_sessionAdminExceptions.put(msgKey, t);
}
- public void setQueryResultList(List list)
+ public void setQueryResultList(List<ObjectSubstituteRoot> list)
{
_queryResultList = list;
}
- public List getQueryResultList()
+ public List<ObjectSubstituteRoot> getQueryResultList()
{
return _queryResultList;
}
Modified: trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/server/IntraVmConnectionFactory.java
===================================================================
--- trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/server/IntraVmConnectionFactory.java 2012-01-23 18:42:15 UTC (rev 6561)
+++ trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/server/IntraVmConnectionFactory.java 2012-01-23 18:53:11 UTC (rev 6562)
@@ -7,7 +7,7 @@
public class IntraVmConnectionFactory
{
- public HibernateServerConnection createHibernateConnection(HibernateConfiguration cfg)
+ public HibernateServerConnection createHibernateConnection(HibernateConfiguration cfg, boolean isServer)
{
try
{
@@ -47,7 +47,7 @@
Thread.currentThread().setContextClassLoader(null);
- return new HibernateServerConnectionImpl(sessionFactoryImpl, cl);
+ return new HibernateServerConnectionImpl(sessionFactoryImpl, cl, isServer);
}
catch (Exception e)
{
Added: trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/server/ObjectSubstitute.java
===================================================================
--- trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/server/ObjectSubstitute.java (rev 0)
+++ trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/server/ObjectSubstitute.java 2012-01-23 18:53:11 UTC (rev 6562)
@@ -0,0 +1,77 @@
+package net.sourceforge.squirrel_sql.plugins.hibernate.server;
+
+import java.io.Serializable;
+import java.lang.reflect.Field;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashMap;
+
+public class ObjectSubstitute implements Serializable
+{
+ private HashMap<String, PropertySubstitute> _substituteValueByPropertyName = new HashMap<String, PropertySubstitute>();
+ private MappedClassInfoData _mappedClassInfoData;
+ private String _toString;
+
+ /**
+ * Is seriously meant to be package visible because it must not called nowhere except during initialzation in ObjectSubstituteFactory
+ */
+ ObjectSubstitute(MappedClassInfoData mappedClassInfoData, String toString)
+ {
+ _mappedClassInfoData = mappedClassInfoData;
+ _toString = toString;
+ }
+
+ void putSubstituteValueByPropertyName(String propertyName, PropertySubstitute propertySubstitute)
+ {
+ _substituteValueByPropertyName.put(propertyName, propertySubstitute);
+ }
+
+ public String getClassName()
+ {
+ return _mappedClassInfoData.getMappedClassName();
+ }
+
+ /**
+ * @return May return ObjectSubstitute or plain primitive mapped value
+ */
+ public Object getValue(String propertyName)
+ {
+ return _substituteValueByPropertyName.get(propertyName).getSingleValue();
+ }
+
+ public String getTypeName(String propertyName)
+ {
+ return _substituteValueByPropertyName.get(propertyName).getHibernatePropertyInfo().getClassName();
+ }
+
+ public boolean wasInitialized(String propertyName)
+ {
+ return _substituteValueByPropertyName.get(propertyName).isInitialized();
+ }
+
+ public Collection<? extends ObjectSubstitute> getPersistentCollection(String propertyName)
+ {
+ return _substituteValueByPropertyName.get(propertyName).getObjectSubstituteCollection();
+ }
+
+ public boolean isPersistenCollection(String propertyName)
+ {
+ return _substituteValueByPropertyName.get(propertyName).isPersistenCollection();
+ }
+
+ public boolean isNull(String propertyName)
+ {
+ return _substituteValueByPropertyName.get(propertyName).isNull(); //To change body of created methods use File | Settings | File Templates.
+ }
+
+ public HibernatePropertyInfo getHibernatePropertyInfo(String propertyName)
+ {
+ return _substituteValueByPropertyName.get(propertyName).getHibernatePropertyInfo();
+ }
+
+ @Override
+ public String toString()
+ {
+ return _toString;
+ }
+}
Copied: trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/server/ObjectSubstituteFactory.java (from rev 6557, trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/server/HibernateProxyHandler.java)
===================================================================
--- trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/server/ObjectSubstituteFactory.java (rev 0)
+++ trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/server/ObjectSubstituteFactory.java 2012-01-23 18:53:11 UTC (rev 6562)
@@ -0,0 +1,192 @@
+package net.sourceforge.squirrel_sql.plugins.hibernate.server;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashMap;
+
+
+/**
+ * Needed to remove lazy loading non collection proxies. These proxies caused serialization
+ * problems when transferred from the external hibernate process.
+ */
+public class ObjectSubstituteFactory
+{
+ private ClassLoader _cl;
+ private ReflectionCaller _rc;
+
+ public ObjectSubstituteFactory(ClassLoader cl)
+ {
+ _cl = cl;
+ _rc = new ReflectionCaller();
+ }
+
+
+ public ArrayList<ObjectSubstituteRoot> replaceObjectsWithSubstitutes(Collection col, HashMap<String, MappedClassInfoData> infoDataByClassName)
+ {
+ try
+ {
+ HashMap<Object, ObjectSubstitute> doneObjs = new HashMap<Object, ObjectSubstitute>();
+
+ if (null == col)
+ {
+ return null;
+ }
+
+
+ ArrayList<ObjectSubstituteRoot> ret = new ArrayList<ObjectSubstituteRoot>();
+ for (Object o : col)
+ {
+ ObjectSubstituteRoot buf;
+
+ if(o instanceof Object[])
+ {
+ ArrayList<ObjectSubstitute> arrBuf = new ArrayList<ObjectSubstitute>();
+ Object[] arr = (Object[]) o;
+ for (Object entry : arr)
+ {
+ arrBuf.add(_prepareObjectSubstitute(entry, infoDataByClassName, doneObjs));
+ }
+ buf = new ObjectSubstituteRoot(arrBuf);
+ }
+ else
+ {
+ buf = new ObjectSubstituteRoot(_prepareObjectSubstitute(o, infoDataByClassName, doneObjs));
+ }
+
+ ret.add(buf);
+ }
+ return ret;
+ }
+ catch (IllegalAccessException e)
+ {
+ throw new RuntimeException(e);
+ }
+
+ }
+
+ private ArrayList<ObjectSubstitute> _prepareObjectSubstitutesForCollection(Collection col, HashMap<String, MappedClassInfoData> infoDataByClassName, HashMap<Object, ObjectSubstitute> doneObjs)
+ {
+ try
+ {
+
+ ArrayList<ObjectSubstitute> ret = new ArrayList<ObjectSubstitute>();
+ if (isInitialized(col))
+ {
+ for (Object o : col)
+ {
+ ret.add(_prepareObjectSubstitute(o, infoDataByClassName, doneObjs));
+ }
+ }
+ return ret;
+
+ }
+ catch (Exception e)
+ {
+ throw new RuntimeException(e);
+ }
+ }
+
+ private ObjectSubstitute _prepareObjectSubstitute(Object o, HashMap<String, MappedClassInfoData> infoDataByClassName, HashMap<Object, ObjectSubstitute> doneObjs) throws IllegalAccessException
+ {
+ if (null == o)
+ {
+ return null;
+ }
+
+ ObjectSubstitute ret = doneObjs.get(o);
+ if (null != ret)
+ {
+ return ret;
+ }
+
+ MappedClassInfoData mappedClassInfoData = infoDataByClassName.get(o.getClass().getName());
+
+ ret = new ObjectSubstitute(mappedClassInfoData, o.toString());
+ doneObjs.put(o, ret);
+
+ PropertyAccessor pkAccessor = PropertyAccessor.createAccessor(o.getClass(), mappedClassInfoData.getIndentifierHibernatePropertyInfo().getPropertyName());
+ PropertySubstitute pkPropertySubstitute = new PropertySubstitute(mappedClassInfoData.getIndentifierHibernatePropertyInfo(), pkAccessor.get(o), true);
+ ret.putSubstituteValueByPropertyName(mappedClassInfoData.getIndentifierHibernatePropertyInfo().getPropertyName(), pkPropertySubstitute);
+
+
+
+ for (HibernatePropertyInfo hibernatePropertyInfo : mappedClassInfoData.getHibernatePropertyInfos())
+ {
+ PropertyAccessor accessor = PropertyAccessor.createAccessor(o.getClass(), hibernatePropertyInfo.getPropertyName());
+
+ if( null == hibernatePropertyInfo.getCollectionClassName() )
+ {
+
+ MappedClassInfoData propMappedClassInfoData = infoDataByClassName.get(hibernatePropertyInfo.getClassName());
+ if(null == propMappedClassInfoData)
+ {
+ PropertySubstitute propertySubstitute = new PropertySubstitute(hibernatePropertyInfo, accessor.get(o), true);
+ ret.putSubstituteValueByPropertyName(hibernatePropertyInfo.getPropertyName(), propertySubstitute);
+ }
+ else
+ {
+ if(isInitialized(accessor.get(o)))
+ {
+ ObjectSubstitute objectSubstitute = _prepareObjectSubstitute(accessor.get(o), infoDataByClassName, doneObjs);
+ PropertySubstitute propertySubstitute = new PropertySubstitute(hibernatePropertyInfo, objectSubstitute, true);
+ ret.putSubstituteValueByPropertyName(hibernatePropertyInfo.getPropertyName(), propertySubstitute);
+ }
+ else
+ {
+ PropertySubstitute propertySubstitute = new PropertySubstitute(hibernatePropertyInfo, (ObjectSubstitute)null, false);
+ ret.putSubstituteValueByPropertyName(hibernatePropertyInfo.getPropertyName(), propertySubstitute);
+ }
+ }
+ }
+ else
+ {
+ ArrayList<ObjectSubstitute> objectSubstituteCollection = new ArrayList<ObjectSubstitute>();
+
+ Collection col = (Collection) accessor.get(o);
+ if (isInitialized(col))
+ {
+ objectSubstituteCollection = _prepareObjectSubstitutesForCollection(col, infoDataByClassName, doneObjs);
+ }
+
+ PropertySubstitute propertySubstitute = new PropertySubstitute(hibernatePropertyInfo, objectSubstituteCollection, isInitialized(col));
+ ret.putSubstituteValueByPropertyName(hibernatePropertyInfo.getPropertyName(), propertySubstitute);
+ }
+ }
+
+// Field[] declaredFields = o.getClass().getDeclaredFields();
+// for (Field declaredField : declaredFields)
+// {
+// if (infoDataByClassName.containsKey(declaredField.getType().getName()))
+// {
+// declaredField.setAccessible(true);
+// Object fielddObj = declaredField.get(o);
+// if (null != fielddObj)
+// {
+// if (-1 < fielddObj.getClass().getName().indexOf('$'))
+// {
+// ret.set(declaredField, null);
+// //declaredField.set(o, null);
+// }
+// else
+// {
+// ret.set(declaredField, _prepareObjectSubstitutes(fielddObj, infoDataByClassName, doneObjs));
+// }
+// }
+// }
+// else if (Collection.class.isAssignableFrom(declaredField.getType()))
+// {
+// declaredField.setAccessible(true);
+// Object fielddObj = declaredField.get(o);
+// ret.setList(declaredField, _prepareObjectSubstitutesForCollection((Collection) fielddObj, infoDataByClassName, doneObjs, false));
+// }
+// }
+
+ return ret;
+ }
+
+ private Boolean isInitialized(Object obj)
+ {
+ return (Boolean) _rc.callStaticMethod(_cl, "org.hibernate.Hibernate", "isInitialized", new Class[]{Object.class}, new Object[]{obj}).getCallee();
+ }
+
+}
Added: trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/server/ObjectSubstituteRoot.java
===================================================================
--- trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/server/ObjectSubstituteRoot.java (rev 0)
+++ trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/server/ObjectSubstituteRoot.java 2012-01-23 18:53:11 UTC (rev 6562)
@@ -0,0 +1,58 @@
+package net.sourceforge.squirrel_sql.plugins.hibernate.server;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.List;
+
+public class ObjectSubstituteRoot implements Serializable
+{
+ private ArrayList<ObjectSubstitute> _objectSubstituteArray;
+ private ObjectSubstitute _objectSubstitute;
+
+ public ObjectSubstituteRoot(ArrayList<ObjectSubstitute> objectSubstituteArray)
+ {
+ _objectSubstituteArray = objectSubstituteArray;
+ }
+
+ public ObjectSubstituteRoot(ObjectSubstitute objectSubstitute)
+ {
+ _objectSubstitute = objectSubstitute;
+ }
+
+ public boolean isArray()
+ {
+ return null != _objectSubstituteArray;
+ }
+
+ public int getArraySize()
+ {
+ return _objectSubstituteArray.size();
+ }
+
+ public ObjectSubstitute getArrayItemAt(int i)
+ {
+ return _objectSubstituteArray.get(i);
+ }
+
+ public ObjectSubstitute getObjectSubstitute()
+ {
+ return _objectSubstitute;
+ }
+
+ public static List<ObjectSubstitute> toObjectSubstitutes(List<ObjectSubstituteRoot> nonArrayRoots)
+ {
+ ArrayList<ObjectSubstitute> ret = new ArrayList<ObjectSubstitute>();
+
+ for (ObjectSubstituteRoot nonArrayRoot : nonArrayRoots)
+ {
+ if(nonArrayRoot.isArray())
+ {
+ throw new IllegalArgumentException("Should only be called for non array");
+ }
+
+ ret.add(nonArrayRoot._objectSubstitute);
+ }
+
+ return ret;
+ }
+}
Copied: trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/server/PropertyAccessor.java (from rev 6557, trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/viewobjects/PropertyAccessor.java)
===================================================================
--- trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/server/PropertyAccessor.java (rev 0)
+++ trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/server/PropertyAccessor.java 2012-01-23 18:53:11 UTC (rev 6562)
@@ -0,0 +1,101 @@
+package net.sourceforge.squirrel_sql.plugins.hibernate.server;
+
+import java.lang.reflect.Field;
+import java.lang.reflect.Method;
+
+public class PropertyAccessor
+{
+ private Field _field;
+ private Method _method;
+
+ private PropertyAccessor(Field field)
+ {
+ _field = field;
+ _field.setAccessible(true);
+ }
+
+ private PropertyAccessor(Method method)
+ {
+ _method = method;
+ _method.setAccessible(true);
+ }
+
+ static PropertyAccessor createAccessor(Class<? extends Object> clazz, String propertyName)
+ {
+ if(null == clazz || clazz.equals(Object.class))
+ {
+ return null;
+ }
+
+ try
+ {
+ Field f = clazz.getDeclaredField(propertyName);
+ return new PropertyAccessor(f);
+ }
+ catch (NoSuchFieldException nsfe)
+ {
+ try
+ {
+ Method m = clazz.getDeclaredMethod(toGetter(propertyName, false));
+ return new PropertyAccessor(m);
+ }
+ catch (NoSuchMethodException nsme)
+ {
+ try
+ {
+ Method m = clazz.getDeclaredMethod(toGetter(propertyName, true));
+ return new PropertyAccessor(m);
+ }
+ catch (NoSuchMethodException e)
+ {
+ return createAccessor(clazz.getSuperclass(), propertyName);
+ }
+ }
+ }
+ }
+
+ private static String toGetter(String propertyName, boolean isBoolean)
+ {
+ String ret = Character.toUpperCase(propertyName.charAt(0)) + propertyName.substring(1);
+
+ if(isBoolean)
+ {
+ return "is" + ret;
+ }
+ else
+ {
+ return "get" + ret;
+ }
+ }
+
+ Object get(Object obj)
+ {
+ try
+ {
+ if(null != _field)
+ {
+ return _field.get(obj);
+ }
+ else
+ {
+ return _method.invoke(obj, new Object[0]);
+ }
+ }
+ catch (Exception e)
+ {
+ throw new RuntimeException(e);
+ }
+ }
+
+ Class getType()
+ {
+ if(null != _field)
+ {
+ return _field.getType();
+ }
+ else
+ {
+ return _method.getReturnType();
+ }
+ }
+}
Added: trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/server/PropertySubstitute.java
===================================================================
--- trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/server/PropertySubstitute.java (rev 0)
+++ trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/server/PropertySubstitute.java 2012-01-23 18:53:11 UTC (rev 6562)
@@ -0,0 +1,78 @@
+package net.sourceforge.squirrel_sql.plugins.hibernate.server;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+
+public class PropertySubstitute implements Serializable
+{
+ private HibernatePropertyInfo _hibernatePropertyInfo;
+ private ArrayList<ObjectSubstitute> _objectSubstituteCollection;
+ private Object _plainValue;
+ private ObjectSubstitute _objectSubstitute;
+ private boolean _initialized;
+
+ PropertySubstitute(HibernatePropertyInfo hibernatePropertyInfo, ObjectSubstitute objectSubstitute, boolean isInitialized)
+ {
+ _hibernatePropertyInfo = hibernatePropertyInfo;
+ _objectSubstitute = objectSubstitute;
+ _initialized = isInitialized;
+ }
+
+ PropertySubstitute(HibernatePropertyInfo hibernatePropertyInfo, ArrayList<ObjectSubstitute> objectSubstituteCollection, boolean isInitialized)
+ {
+ _hibernatePropertyInfo = hibernatePropertyInfo;
+ _objectSubstituteCollection = objectSubstituteCollection;
+ _initialized = isInitialized;
+ }
+
+ PropertySubstitute(HibernatePropertyInfo hibernatePropertyInfo, Object plainValue, boolean isInitialized)
+ {
+ _hibernatePropertyInfo = hibernatePropertyInfo;
+ _plainValue = plainValue;
+ _initialized = isInitialized;
+ }
+
+ public HibernatePropertyInfo getHibernatePropertyInfo()
+ {
+ return _hibernatePropertyInfo;
+ }
+
+ public ArrayList<ObjectSubstitute> getObjectSubstituteCollection()
+ {
+ return _objectSubstituteCollection;
+ }
+
+ public boolean isInitialized()
+ {
+ return _initialized;
+ }
+
+ public Object getSingleValue()
+ {
+ if(null != _objectSubstituteCollection)
+ {
+ throw new IllegalStateException("Is a collection");
+ }
+
+ if(null == _plainValue)
+ {
+ return _objectSubstitute;
+ }
+ else
+ {
+ return _plainValue;
+ }
+
+ }
+
+ public boolean isPersistenCollection()
+ {
+ return null != _objectSubstituteCollection;
+
+ }
+
+ public boolean isNull()
+ {
+ return null == _objectSubstituteCollection && null == _objectSubstitute && null == _plainValue;
+ }
+}
Modified: trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/server/RCParam.java
===================================================================
--- trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/server/RCParam.java 2012-01-23 18:42:15 UTC (rev 6561)
+++ trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/server/RCParam.java 2012-01-23 18:53:11 UTC (rev 6562)
@@ -2,16 +2,16 @@
import java.util.ArrayList;
-public class RCParam
+class RCParam
{
private ArrayList<Class> _types = new ArrayList<Class>();
private ArrayList<Object> _values = new ArrayList<Object>();
- public RCParam()
+ RCParam()
{
}
- public RCParam(Object[] params)
+ RCParam(Object[] params)
{
for (int i = 0; i < params.length; i++)
{
@@ -21,7 +21,7 @@
}
- public RCParam add(Object paramValue, Class type)
+ RCParam add(Object paramValue, Class type)
{
_types.add(type);
_values.add(paramValue);
@@ -29,17 +29,17 @@
return this;
}
- public int size()
+ int size()
{
return _values.size();
}
- public Class getType(int i)
+ Class getType(int i)
{
return _types.get(i);
}
- public Object getValue(int i)
+ Object getValue(int i)
{
return _values.get(i);
}
Modified: trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/server/ReflectionCaller.java
===================================================================
--- trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/server/ReflectionCaller.java 2012-01-23 18:42:15 UTC (rev 6561)
+++ trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/server/ReflectionCaller.java 2012-01-23 18:53:11 UTC (rev 6562)
@@ -6,23 +6,23 @@
import java.util.Collection;
import java.util.List;
-public class ReflectionCaller
+class ReflectionCaller
{
private Object _callee;
- public ReflectionCaller(Object callee)
+ ReflectionCaller(Object callee)
{
_callee = callee;
}
- public ReflectionCaller()
+ ReflectionCaller()
{
this(null);
}
- public ReflectionCaller getClass(String className, ClassLoader cl)
+ ReflectionCaller getClass(String className, ClassLoader cl)
{
try
{
@@ -34,7 +34,7 @@
}
}
- public ReflectionCaller callConstructor(Class[] paramTypes, Object[] params)
+ ReflectionCaller callConstructor(Class[] paramTypes, Object[] params)
{
try
{
@@ -48,7 +48,7 @@
}
- public List<ReflectionCaller> callArrayMethod(String methodName)
+ List<ReflectionCaller> callArrayMethod(String methodName)
{
try
{
@@ -73,12 +73,12 @@
}
- public Object getCallee()
+ Object getCallee()
{
return _callee;
}
- public Collection<ReflectionCaller> callCollectionMethod(String methodName)
+ Collection<ReflectionCaller> callCollectionMethod(String methodName)
{
try
{
@@ -103,7 +103,7 @@
}
}
- public ReflectionCaller getField(String fieldName)
+ ReflectionCaller getField(String fieldName)
{
try
{
@@ -115,7 +115,7 @@
}
}
- public Class getCalleeClass()
+ Class getCalleeClass()
{
if(_callee instanceof Class)
{
@@ -133,18 +133,18 @@
* callMethod(String methodName, Object... params)
* NoSuchMethodErrors occur if it isn't there.
*/
- public ReflectionCaller callMethod(String methodName)
+ ReflectionCaller callMethod(String methodName)
{
return callMethod(methodName, new RCParam(new Object[0]));
}
- public ReflectionCaller callMethod(String methodName, Object... params)
+ ReflectionCaller callMethod(String methodName, Object... params)
{
return callMethod(methodName, new RCParam(params));
}
- public ReflectionCaller callMethod(String methodName, RCParam param)
+ ReflectionCaller callMethod(String methodName, RCParam param)
{
try
{
@@ -205,7 +205,7 @@
}
- public ReflectionCaller callStaticMethod(ClassLoader cl, String className, String methName, Class[] paramTypes, Object[] args)
+ ReflectionCaller callStaticMethod(ClassLoader cl, String className, String methName, Class[] paramTypes, Object[] args)
{
try
{
Modified: trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/server/ServerMainImpl.java
===================================================================
--- trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/server/ServerMainImpl.java 2012-01-23 18:42:15 UTC (rev 6561)
+++ trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/server/ServerMainImpl.java 2012-01-23 18:53:11 UTC (rev 6562)
@@ -45,7 +45,7 @@
try
{
IntraVmConnectionFactory intraVmConnectionFactory = new IntraVmConnectionFactory();
- HibernateServerConnection ret = intraVmConnectionFactory.createHibernateConnection(cfg);
+ HibernateServerConnection ret = intraVmConnectionFactory.createHibernateConnection(cfg, true);
return (HibernateServerConnection) UnicastRemoteObject.exportObject(ret, 0);
}
Added: trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/server/SquirrelHibernateServerException.java
===================================================================
--- trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/server/SquirrelHibernateServerException.java (rev 0)
+++ trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/server/SquirrelHibernateServerException.java 2012-01-23 18:53:11 UTC (rev 6562)
@@ -0,0 +1,33 @@
+package net.sourceforge.squirrel_sql.plugins.hibernate.server;
+
+import java.io.Serializable;
+
+/**
+ * Created by IntelliJ IDEA.
+ * User: gerd
+ * Date: 22.01.12
+ * Time: 20:19
+ */
+public class SquirrelHibernateServerException extends RuntimeException implements Serializable
+{
+ private String _originalMessage;
+ private String _originalExceptionClassName;
+
+ public SquirrelHibernateServerException(String messageIncludingOriginalStackTrace, String originalMessage, String originalExceptionClassName)
+ {
+ super(messageIncludingOriginalStackTrace);
+ _originalMessage = originalMessage;
+ _originalExceptionClassName = originalExceptionClassName;
+ }
+
+ @Override
+ public String getMessage()
+ {
+ return _originalMessage;
+ }
+
+ public String getOriginalExceptionClassName()
+ {
+ return _originalExceptionClassName;
+ }
+}
Modified: trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/util/HqlQueryErrorUtil.java
===================================================================
--- trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/util/HqlQueryErrorUtil.java 2012-01-23 18:42:15 UTC (rev 6561)
+++ trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/util/HqlQueryErrorUtil.java 2012-01-23 18:53:11 UTC (rev 6562)
@@ -6,6 +6,7 @@
import net.sourceforge.squirrel_sql.fw.util.log.ILogger;
import net.sourceforge.squirrel_sql.fw.util.log.LoggerController;
import net.sourceforge.squirrel_sql.plugins.hibernate.HQLPanelController;
+import net.sourceforge.squirrel_sql.plugins.hibernate.server.SquirrelHibernateServerException;
public class HqlQueryErrorUtil
{
@@ -20,7 +21,15 @@
ExceptionFormatter formatter = sess.getExceptionFormatter();
try
{
- ret = formatter.format(t);
+ if (t instanceof SquirrelHibernateServerException)
+ {
+ ret = t.getMessage();
+ }
+ else
+ {
+ ret = formatter.format(t);
+ }
+
if (showInMessagePanel)
{
sess.showErrorMessage(ret);
@@ -33,7 +42,7 @@
}
if (sess.getProperties().getWriteSQLErrorsToLog() ||
- (-1 == t.getClass().getName().toLowerCase().indexOf("hibernate") && -1 == t.getClass().getName().toLowerCase().indexOf("antlr")))
+ isHibernateException(t))
{
// If this is not a hibernate error we write a log entry
s_log.error(t);
@@ -41,4 +50,19 @@
return ret;
}
+
+ private static boolean isHibernateException(Throwable t)
+ {
+ String className;
+ if (t instanceof SquirrelHibernateServerException)
+ {
+ className = ((SquirrelHibernateServerException)t).getOriginalExceptionClassName();
+ }
+ else
+ {
+ className = t.getClass().getName();
+ }
+
+ return (-1 == className.toLowerCase().indexOf("hibernate") && -1 == className.toLowerCase().indexOf("antlr"));
+ }
}
Modified: trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/viewobjects/CommandLineOutput.java
===================================================================
--- trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/viewobjects/CommandLineOutput.java 2012-01-23 18:42:15 UTC (rev 6561)
+++ trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/viewobjects/CommandLineOutput.java 2012-01-23 18:53:11 UTC (rev 6562)
@@ -1,8 +1,8 @@
package net.sourceforge.squirrel_sql.plugins.hibernate.viewobjects;
-import net.sourceforge.squirrel_sql.plugins.hibernate.server.ReflectionCaller;
import net.sourceforge.squirrel_sql.plugins.hibernate.mapping.MappedClassInfo;
import net.sourceforge.squirrel_sql.plugins.hibernate.mapping.PropertyInfo;
+import net.sourceforge.squirrel_sql.plugins.hibernate.server.ObjectSubstitute;
import java.util.ArrayList;
@@ -19,7 +19,7 @@
for (SingleResult result : type.getResults())
{
- Object firstObject = result.getObject();
+ ObjectSubstitute firstObject = result.getObject();
displayMappedObject(mappedClassInfos, mci, firstObject, persistenCollectionClass);
}
}
@@ -38,7 +38,7 @@
for (SingleResult queryResult : type.getResults())
{
MappedClassInfo mci = queryResult.getMappedClassInfo();
- Object obj = queryResult.getObject();
+ ObjectSubstitute obj = queryResult.getObject();
displayMappedObject(mappedClassInfos, mci, obj, persistenCollectionClass);
}
@@ -56,7 +56,7 @@
for (SingleResult singleResult : singleResults)
{
MappedClassInfo mci = singleResult.getMappedClassInfo();
- Object obj = singleResult.getObject();
+ ObjectSubstitute obj = singleResult.getObject();
displayMappedObject(mappedClassInfos, mci, obj, persistenCollectionClass);
}
@@ -64,7 +64,7 @@
}
}
- static void displayMappedObject(ArrayList<MappedClassInfo> mappedClassInfos, MappedClassInfo mci, Object obj, Class persistenCollectionClass)
+ static void displayMappedObject(ArrayList<MappedClassInfo> mappedClassInfos, MappedClassInfo mci, ObjectSubstitute obj, Class persistenCollectionClass)
{
PropertyInfo[] propertyInfos = mci.getAttributes();
@@ -78,9 +78,7 @@
Object value = hpr.getValue();
if (null != value && persistenCollectionClass.isAssignableFrom(value.getClass()))
{
- ReflectionCaller rc = new ReflectionCaller(value);
-
- System.out.println(" PersistentCollection: " + hpr.getName() + "; wasInitialized=" + rc.callMethod("wasInitialized").getCallee());
+ System.out.println(" PersistentCollection: " + hpr.getName() + "; wasInitialized=" + hpr.wasInitialized());
}
else if (null != ViewObjectsUtil.findMappedClassInfo(hpr.getTypeName(), mappedClassInfos, true))
{
Modified: trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/viewobjects/HibernatePropertyReader.java
===================================================================
--- trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/viewobjects/HibernatePropertyReader.java 2012-01-23 18:42:15 UTC (rev 6561)
+++ trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/viewobjects/HibernatePropertyReader.java 2012-01-23 18:53:11 UTC (rev 6562)
@@ -1,25 +1,20 @@
package net.sourceforge.squirrel_sql.plugins.hibernate.viewobjects;
+import net.sourceforge.squirrel_sql.plugins.hibernate.server.HibernatePropertyInfo;
+import net.sourceforge.squirrel_sql.plugins.hibernate.server.ObjectSubstitute;
import net.sourceforge.squirrel_sql.plugins.hibernate.util.HibernateUtil;
-import net.sourceforge.squirrel_sql.plugins.hibernate.viewobjects.PropertyAccessor;
-import java.lang.reflect.Field;
-import java.lang.reflect.Method;
+import java.util.Collection;
public class HibernatePropertyReader
{
private String _propertyName;
- private Object _obj;
- private PropertyAccessor _propertyAccessor;
+ private ObjectSubstitute _obj;
- public HibernatePropertyReader(String propertyName, Object obj)
+ public HibernatePropertyReader(String propertyName, ObjectSubstitute obj)
{
_propertyName = propertyName;
_obj = obj;
- if (null != obj)
- {
- _propertyAccessor = getAccessor(_obj.getClass());
- }
}
public String getName()
@@ -30,82 +25,79 @@
public Object getValue()
{
- try
+ if (null == _obj)
{
- if (null == _propertyAccessor)
- {
- return HibernateUtil.OBJECT_IS_NULL;
- }
- else
- {
- return _propertyAccessor.get(_obj);
- }
+ return HibernateUtil.OBJECT_IS_NULL;
}
- catch (Exception e)
+ else
{
- throw new RuntimeException("Cannot access property: " + _obj.getClass().getName() + "." + _propertyName, e);
+ return _obj.getValue(_propertyName);
}
}
- private PropertyAccessor getAccessor(Class<? extends Object> clazz)
+ public String getTypeName()
{
- if(null == clazz || clazz.equals(Object.class))
+
+ if (null == _obj)
{
- return null;
+ return HibernateUtil.OBJECT_IS_NULL;
}
+ else
+ {
+ return _obj.getTypeName(_propertyName);
+ }
+ }
- try
+ public boolean wasInitialized()
+ {
+ if (null == _obj)
{
- Field f = clazz.getDeclaredField(_propertyName);
- return new PropertyAccessor(f);
+ return true;
}
- catch (NoSuchFieldException nsfe)
+ else
{
- try
- {
- Method m = clazz.getDeclaredMethod(toGetter(_propertyName, false));
- return new PropertyAccessor(m);
- }
- catch (NoSuchMethodException nsme)
- {
- try
- {
- Method m = clazz.getDeclaredMethod(toGetter(_propertyName, true));
- return new PropertyAccessor(m);
- }
- catch (NoSuchMethodException e)
- {
- return getAccessor(clazz.getSuperclass());
- }
- }
+ return _obj.wasInitialized(_propertyName);
}
}
- private String toGetter(String propertyName, boolean isBoolean)
+ public boolean isPersistenCollection()
{
- String ret = Character.toUpperCase(propertyName.charAt(0)) + propertyName.substring(1);
+ if (null == _obj)
+ {
+ return false;
+ }
+ else
+ {
+ return _obj.isPersistenCollection(_propertyName);
+ }
+ }
- if(isBoolean)
+ public Collection<? extends ObjectSubstitute> getPersistentCollection()
+ {
+ if (null == _obj)
{
- return "is" + ret;
+ return null;
}
else
{
- return "get" + ret;
+ return _obj.getPersistentCollection(_propertyName);
}
}
- public String getTypeName()
+ public boolean isNull()
{
- if (null == _propertyAccessor)
+ if (null == _obj)
{
- return HibernateUtil.OBJECT_IS_NULL;
+ return false;
}
else
{
- return _propertyAccessor.getType().getName();
+ return _obj.isNull(_propertyName);
}
}
-
+ public HibernatePropertyInfo getHibernatePropertyInfo()
+ {
+ return _obj.getHibernatePropertyInfo(_propertyName);
+ }
}
Modified: trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/viewobjects/ObjectResultController.java
===================================================================
--- trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/viewobjects/ObjectResultController.java 2012-01-23 18:42:15 UTC (rev 6561)
+++ trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/viewobjects/ObjectResultController.java 2012-01-23 18:53:11 UTC (rev 6562)
@@ -9,6 +9,8 @@
import net.sourceforge.squirrel_sql.fw.util.log.LoggerController;
import net.sourceforge.squirrel_sql.plugins.hibernate.HibernateConnection;
import net.sourceforge.squirrel_sql.plugins.hibernate.HibernatePluginResources;
+import net.sourceforge.squirrel_sql.plugins.hibernate.server.ObjectSubstitute;
+import net.sourceforge.squirrel_sql.plugins.hibernate.server.ObjectSubstituteRoot;
import javax.swing.*;
import java.util.List;
@@ -89,7 +91,7 @@
}
}
- List list = queryListCreator.getList();
+ List<ObjectSubstituteRoot> list = queryListCreator.getList();
if (null == list)
{
Modified: trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/viewobjects/ObjectResultTabController.java
===================================================================
--- trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/viewobjects/ObjectResultTabController.java 2012-01-23 18:42:15 UTC (rev 6561)
+++ trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/viewobjects/ObjectResultTabController.java 2012-01-23 18:53:11 UTC (rev 6562)
@@ -6,6 +6,8 @@
import net.sourceforge.squirrel_sql.plugins.hibernate.HibernateConnection;
import net.sourceforge.squirrel_sql.plugins.hibernate.mapping.MappedClassInfo;
import net.sourceforge.squirrel_sql.plugins.hibernate.HibernatePluginResources;
+import net.sourceforge.squirrel_sql.plugins.hibernate.server.ObjectSubstitute;
+import net.sourceforge.squirrel_sql.plugins.hibernate.server.ObjectSubstituteRoot;
import javax.swing.event.TreeExpansionEvent;
import javax.swing.event.TreeExpansionListener;
@@ -26,7 +28,7 @@
private ObjectResultTab _tab;
private ResultsController _resultsController;
- public ObjectResultTabController(List objects, int maxNumResults, HibernateConnection con, String hqlQuery, HibernatePluginResources resource, final ObjectResultTabControllerListener l, ISession session)
+ public ObjectResultTabController(List<ObjectSubstituteRoot> objects, int maxNumResults, HibernateConnection con, String hqlQuery, HibernatePluginResources resource, final ObjectResultTabControllerListener l, ISession session)
{
_tab = new ObjectResultTab(resource);
@@ -56,14 +58,12 @@
//String hql = "select be from Best be inner join fetch be.bestPosses bep";
- Class persistenCollectionClass = con.getPersistenCollectionClass();
-
ArrayList<MappedClassInfo> mappedClassInfos = con.getMappedClassInfos();
- _resultsController = new ResultsController(_tab.pnlResults, hqlQuery, persistenCollectionClass, mappedClassInfos, session);
+ _resultsController = new ResultsController(_tab.pnlResults, hqlQuery, mappedClassInfos, session);
- RootType qrmr = new RootType(objects, con.getMappedClassInfos(), persistenCollectionClass);
+ RootType qrmr = new RootType(objects, con.getMappedClassInfos());
DefaultMutableTreeNode rootNode = new DefaultMutableTreeNode(qrmr);
_tab.treeTypes.setModel(new DefaultTreeModel(rootNode));
Modified: trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/viewobjects/PersistentCollectionResult.java
===================================================================
--- trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/viewobjects/PersistentCollectionResult.java 2012-01-23 18:42:15 UTC (rev 6561)
+++ trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/viewobjects/PersistentCollectionResult.java 2012-01-23 18:53:11 UTC (rev 6562)
@@ -2,56 +2,44 @@
import net.sourceforge.squirrel_sql.fw.util.StringManager;
import net.sourceforge.squirrel_sql.fw.util...
[truncated message content] |
|
From: <ger...@us...> - 2012-01-23 18:42:24
|
Revision: 6561
http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=6561&view=rev
Author: gerdwagner
Date: 2012-01-23 18:42:15 +0000 (Mon, 23 Jan 2012)
Log Message:
-----------
No duplicate error message when connect fails
Modified Paths:
--------------
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/db/ConnectToAliasCallBack.java
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/mainframe/action/ConnectToAliasCommand.java
trunk/sql12/doc/src/main/resources/changes.txt
trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/gui/ErrorDialog.java
Modified: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/db/ConnectToAliasCallBack.java
===================================================================
--- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/db/ConnectToAliasCallBack.java 2012-01-21 16:36:23 UTC (rev 6560)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/db/ConnectToAliasCallBack.java 2012-01-23 18:42:15 UTC (rev 6561)
@@ -105,16 +105,13 @@
protected void showErrorDialog(final String msg, final Throwable th)
{
- synchronized (this)
+ SwingUtilities.invokeLater(new Runnable()
{
- SwingUtilities.invokeLater(new Runnable()
+ public void run()
{
- public void run()
- {
- new ErrorDialog(_app.getMainFrame(), msg, th).setVisible(true);
- }
- });
- }
+ new ErrorDialog(_app.getMainFrame(), msg, th).setVisible(true);
+ }
+ });
}
Modified: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/mainframe/action/ConnectToAliasCommand.java
===================================================================
--- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/mainframe/action/ConnectToAliasCommand.java 2012-01-21 16:36:23 UTC (rev 6560)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/mainframe/action/ConnectToAliasCommand.java 2012-01-23 18:42:15 UTC (rev 6561)
@@ -146,7 +146,6 @@
_app.getMainFrame().addWidget(sheet);
DialogWidget.centerWithinDesktop(sheet);
sheet.moveToFront();
- sheet.setVisible(true);
}
Modified: trunk/sql12/doc/src/main/resources/changes.txt
===================================================================
--- trunk/sql12/doc/src/main/resources/changes.txt 2012-01-21 16:36:23 UTC (rev 6560)
+++ trunk/sql12/doc/src/main/resources/changes.txt 2012-01-23 18:42:15 UTC (rev 6561)
@@ -19,6 +19,8 @@
Bug fixes:
+Error dialog showed up twice when an error occurred during Alias connect.
+
3026995 Fixed problem in squirrel-sql.bat for 64-bit windows.
Graph Plugin --> Query Builder:
Modified: trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/gui/ErrorDialog.java
===================================================================
--- trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/gui/ErrorDialog.java 2012-01-21 16:36:23 UTC (rev 6560)
+++ trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/gui/ErrorDialog.java 2012-01-23 18:42:15 UTC (rev 6561)
@@ -17,18 +17,18 @@
* 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.fw.util.StringManager;
+import net.sourceforge.squirrel_sql.fw.util.StringManagerFactory;
+import net.sourceforge.squirrel_sql.fw.util.Utilities;
+
+import javax.swing.*;
import java.awt.*;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import java.awt.event.KeyEvent;
import java.sql.SQLException;
-import javax.swing.*;
-
-import net.sourceforge.squirrel_sql.fw.util.StringManager;
-import net.sourceforge.squirrel_sql.fw.util.StringManagerFactory;
-import net.sourceforge.squirrel_sql.fw.util.Utilities;
-
public class ErrorDialog extends JDialog
{
/** Internationalized strings for this class. */
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
Revision: 6560
http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=6560&view=rev
Author: manningr
Date: 2012-01-21 16:36:23 +0000 (Sat, 21 Jan 2012)
Log Message:
-----------
Added source and destination alias names for PostgreSQL.
Modified Paths:
--------------
trunk/sql12/squirrelsql-integration-environment/src/test/java/net/sourceforge/squirrel_sql/client/session/mainpanel/objecttree/tabs/AliasNames.java
Modified: trunk/sql12/squirrelsql-integration-environment/src/test/java/net/sourceforge/squirrel_sql/client/session/mainpanel/objecttree/tabs/AliasNames.java
===================================================================
--- trunk/sql12/squirrelsql-integration-environment/src/test/java/net/sourceforge/squirrel_sql/client/session/mainpanel/objecttree/tabs/AliasNames.java 2012-01-14 17:20:38 UTC (rev 6559)
+++ trunk/sql12/squirrelsql-integration-environment/src/test/java/net/sourceforge/squirrel_sql/client/session/mainpanel/objecttree/tabs/AliasNames.java 2012-01-21 16:36:23 UTC (rev 6560)
@@ -62,7 +62,9 @@
String POINTBASE_DEST_ALIAS_NAME = "Pointbase (dbcopydest)";
- String POSTGRES_DEST_ALIAS_NAME = "PostgreSQL";
+ String POSTGRES_SOURCE_ALIAS_NAME = "PostgreSQL (dbcopysrc)";
+
+ String POSTGRES_DEST_ALIAS_NAME = "PostgreSQL (dbcopydest)";
String SYBASE_SOURCE_ALIAS_NAME = "Sybase (dbcopysrc)";
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <man...@us...> - 2012-01-14 17:20:45
|
Revision: 6559
http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=6559&view=rev
Author: manningr
Date: 2012-01-14 17:20:38 +0000 (Sat, 14 Jan 2012)
Log Message:
-----------
Updated to newer version of the mssql driver.
Modified Paths:
--------------
trunk/sql12/squirrelsql-integration-environment/pom.xml
Modified: trunk/sql12/squirrelsql-integration-environment/pom.xml
===================================================================
--- trunk/sql12/squirrelsql-integration-environment/pom.xml 2012-01-12 23:41:18 UTC (rev 6558)
+++ trunk/sql12/squirrelsql-integration-environment/pom.xml 2012-01-14 17:20:38 UTC (rev 6559)
@@ -533,9 +533,9 @@
<dependency>
<groupId>com.microsoft</groupId>
<artifactId>sqljdbc4</artifactId>
- <version>2.0.1803.100</version>
+ <version>3.0.1301.101</version>
<scope>test</scope>
- </dependency>
+ </dependency>
</dependencies>
</profile>
<profile>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ger...@us...> - 2012-01-12 23:41:24
|
Revision: 6558
http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=6558&view=rev
Author: gerdwagner
Date: 2012-01-12 23:41:18 +0000 (Thu, 12 Jan 2012)
Log Message:
-----------
Graph Plugin --> Query Builder:
The "Sync result" button of the "Result" view now refreshes the result even if the SQL statement was not changed.
Modified Paths:
--------------
trunk/sql12/doc/src/main/resources/changes.txt
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/GraphQuerySQLPanelCtrl.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/SyncListener.java
Modified: trunk/sql12/doc/src/main/resources/changes.txt
===================================================================
--- trunk/sql12/doc/src/main/resources/changes.txt 2012-01-07 22:55:30 UTC (rev 6557)
+++ trunk/sql12/doc/src/main/resources/changes.txt 2012-01-12 23:41:18 UTC (rev 6558)
@@ -21,6 +21,8 @@
3026995 Fixed problem in squirrel-sql.bat for 64-bit windows.
+Graph Plugin --> Query Builder:
+ The "Sync result" button of the "Result" view now refreshes the result even if the SQL statement was not changed.
3.3.0 (11/20/2011)
Modified: 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/GraphQueryResultPanel.java 2012-01-07 22:55:30 UTC (rev 6557)
+++ trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/querybuilder/GraphQueryResultPanel.java 2012-01-12 23:41:18 UTC (rev 6558)
@@ -15,7 +15,7 @@
SQLResultExecuterPanel resultExecuterPanel;
JCheckBox chkAutoSyncSQL;
- JButton btnSyncSQLNow;
+ JButton btnSyncSQLResultNow;
public GraphQueryResultPanel(ISession session, HideDockButtonHandler hideDockButtonHandler)
@@ -41,8 +41,8 @@
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);
+ btnSyncSQLResultNow = new JButton(s_stringMgr.getString("graph.GraphQueryResultPanel.syncResultNow"));
+ ret.add(btnSyncSQLResultNow, 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);
Modified: 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/GraphQueryResultPanelCtrl.java 2012-01-07 22:55:30 UTC (rev 6557)
+++ trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/querybuilder/GraphQueryResultPanelCtrl.java 2012-01-12 23:41:18 UTC (rev 6558)
@@ -18,12 +18,12 @@
{
_graphQueryResultPanel = new GraphQueryResultPanel(session, hideDockButtonHandler);
- _graphQueryResultPanel.btnSyncSQLNow.addActionListener(new ActionListener()
+ _graphQueryResultPanel.btnSyncSQLResultNow.addActionListener(new ActionListener()
{
@Override
public void actionPerformed(ActionEvent e)
{
- syncListener.synRequested();
+ syncListener.synRequested(true);
}
});
@@ -52,7 +52,7 @@
{
String nextSQL = _nextSQL;
_nextSQL = null;
- execSQL(nextSQL);
+ execSQL(nextSQL, false);
}
}
@@ -60,14 +60,14 @@
{
if(_graphQueryResultPanel.chkAutoSyncSQL.isSelected())
{
- syncListener.synRequested();
+ syncListener.synRequested(false);
}
}
- public void execSQL(String sql)
+ public void execSQL(String sql, boolean force)
{
- if (null != _lastSQL && _lastSQL.trim().equals(sql))
+ if (false == force && null != _lastSQL && _lastSQL.trim().equals(sql))
{
return;
}
Modified: 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/GraphQuerySQLPanelCtrl.java 2012-01-07 22:55:30 UTC (rev 6557)
+++ trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/querybuilder/GraphQuerySQLPanelCtrl.java 2012-01-12 23:41:18 UTC (rev 6558)
@@ -38,7 +38,7 @@
@Override
public void actionPerformed(ActionEvent e)
{
- syncListener.synRequested();
+ syncListener.synRequested(false);
}
});
@@ -53,7 +53,7 @@
if(_graphQuerySQLPanel.chkAutoSyncSQL.isSelected())
{
- syncListener.synRequested();
+ syncListener.synRequested(false);
}
}
Modified: 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/QueryBuilderController.java 2012-01-07 22:55:30 UTC (rev 6557)
+++ trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/querybuilder/QueryBuilderController.java 2012-01-12 23:41:18 UTC (rev 6558)
@@ -142,9 +142,9 @@
return new SyncListener()
{
@Override
- public void synRequested()
+ public void synRequested(boolean force)
{
- syncResult();
+ syncResult(force);
}
};
}
@@ -156,7 +156,7 @@
return new SyncListener()
{
@Override
- public void synRequested()
+ public void synRequested(boolean force)
{
syncSql();
}
@@ -172,7 +172,7 @@
}
else if(_resultDockHandle.isShowing() && _graphQueryResultPanelCtrl.isAutoSync())
{
- syncResult();
+ syncResult(false);
}
else if(_selectDockHandle.isShowing())
{
@@ -198,12 +198,12 @@
}
}
- private void syncResult()
+ private void syncResult(boolean force)
{
SelectStructure selS = _graphQuerySelectPanelCtrl.syncSelectCols(_tableFramesModel);
WhereTreeNodeStructure wts = _graphQueryWherePanelCtrl.syncWhereCols(_tableFramesModel);
OrderStructure os = _graphQueryOrderPanelCtrl.syncOrderCols(_tableFramesModel);
- _graphQueryResultPanelCtrl.execSQL(new QueryBuilderSQLGenerator(_session).generateSQL(_tableFramesModel, wts, os, selS));
+ _graphQueryResultPanelCtrl.execSQL(new QueryBuilderSQLGenerator(_session).generateSQL(_tableFramesModel, wts, os, selS), force);
}
private void syncSql()
Modified: 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/SyncListener.java 2012-01-07 22:55:30 UTC (rev 6557)
+++ trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/querybuilder/SyncListener.java 2012-01-12 23:41:18 UTC (rev 6558)
@@ -2,5 +2,5 @@
public interface SyncListener
{
- void synRequested();
+ void synRequested(boolean force);
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
Revision: 6557
http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=6557&view=rev
Author: manningr
Date: 2012-01-07 22:55:30 +0000 (Sat, 07 Jan 2012)
Log Message:
-----------
Fix compile issue.
Modified Paths:
--------------
trunk/sql12/squirrelsql-integration-environment/src/test/java/net/sourceforge/squirrel_sql/client/session/MockSession.java
Modified: trunk/sql12/squirrelsql-integration-environment/src/test/java/net/sourceforge/squirrel_sql/client/session/MockSession.java
===================================================================
--- trunk/sql12/squirrelsql-integration-environment/src/test/java/net/sourceforge/squirrel_sql/client/session/MockSession.java 2012-01-07 18:34:30 UTC (rev 6556)
+++ trunk/sql12/squirrelsql-integration-environment/src/test/java/net/sourceforge/squirrel_sql/client/session/MockSession.java 2012-01-07 22:55:30 UTC (rev 6557)
@@ -524,7 +524,21 @@
@Override
public SQLConnection createUnmanagedConnection()
{
- // TODO Auto-generated method stub
+ System.err.println("MockSession.createUnmanagedConnection: stub not yet implemented");
return null;
}
+
+ @Override
+ public IMainPanelTab getSelectedMainTab()
+ {
+ System.err.println("MockSession.getSelectedMainTab: stub not yet implemented");
+ return null;
+ }
+
+ @Override
+ public boolean isSessionWidgetActive()
+ {
+ System.err.println("MockSession.isSessionWidgetActive: stub not yet implemented");
+ return false;
+ }
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ger...@us...> - 2012-01-07 18:34:37
|
Revision: 6556
http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=6556&view=rev
Author: gerdwagner
Date: 2012-01-07 18:34:30 +0000 (Sat, 07 Jan 2012)
Log Message:
-----------
Graph Plugin: Tables can be added to a Graph from within the SQL-Editor (accessible from right mouse menu and tools popup).
Modified Paths:
--------------
trunk/sql12/doc/src/main/resources/changes.txt
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/GraphPlugin.java
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/graph.properties
Added Paths:
-----------
trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/sql/TableQualifier.java
trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/AddTableAtQursorToGraph.java
trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/TableToAddWrapper.java
trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/TableToGraph.java
Modified: trunk/sql12/doc/src/main/resources/changes.txt
===================================================================
--- trunk/sql12/doc/src/main/resources/changes.txt 2012-01-05 19:36:06 UTC (rev 6555)
+++ trunk/sql12/doc/src/main/resources/changes.txt 2012-01-07 18:34:30 UTC (rev 6556)
@@ -7,6 +7,9 @@
Enhancements:
Graph Plugin:
+ Tables can be added to a Graph from within the SQL-Editor (accessible from right mouse menu and tools popup).
+
+Graph Plugin:
Graphs can be copied and pasted.
Graph Plugin:
Added: trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/sql/TableQualifier.java
===================================================================
--- trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/sql/TableQualifier.java (rev 0)
+++ trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/sql/TableQualifier.java 2012-01-07 18:34:30 UTC (rev 6556)
@@ -0,0 +1,49 @@
+package net.sourceforge.squirrel_sql.fw.sql;
+
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+
+public class TableQualifier
+{
+ private String _catalog;
+ private String _schema;
+ private String _tableName;
+
+ public TableQualifier(String name)
+ {
+ String[] splits = name.split("\\.");
+
+ List<String> list = Arrays.asList(splits);
+
+ Collections.reverse(list);
+
+ _tableName = list.get(0);
+
+ if(1 < list.size())
+ {
+ _schema = list.get(1);
+ }
+
+ if(2 < list.size())
+ {
+ _catalog = list.get(2);
+ }
+
+ }
+
+ public String getCatalog()
+ {
+ return _catalog;
+ }
+
+ public String getSchema()
+ {
+ return _schema;
+ }
+
+ public String getTableName()
+ {
+ return _tableName;
+ }
+}
Added: trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/AddTableAtQursorToGraph.java
===================================================================
--- trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/AddTableAtQursorToGraph.java (rev 0)
+++ trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/AddTableAtQursorToGraph.java 2012-01-07 18:34:30 UTC (rev 6556)
@@ -0,0 +1,62 @@
+package net.sourceforge.squirrel_sql.plugins.graph;
+
+import net.sourceforge.squirrel_sql.client.IApplication;
+import net.sourceforge.squirrel_sql.client.action.SquirrelAction;
+import net.sourceforge.squirrel_sql.client.plugin.PluginResources;
+import net.sourceforge.squirrel_sql.client.session.ISQLPanelAPI;
+import net.sourceforge.squirrel_sql.client.session.action.ISQLPanelAction;
+import net.sourceforge.squirrel_sql.fw.sql.ITableInfo;
+import net.sourceforge.squirrel_sql.fw.sql.TableQualifier;
+import net.sourceforge.squirrel_sql.fw.util.StringManager;
+import net.sourceforge.squirrel_sql.fw.util.StringManagerFactory;
+
+import javax.swing.*;
+import java.awt.event.ActionEvent;
+
+public class AddTableAtQursorToGraph extends SquirrelAction implements ISQLPanelAction
+{
+ private static final StringManager s_stringMgr = StringManagerFactory.getStringManager(AddTableAtQursorToGraph.class);
+
+
+ private ISQLPanelAPI _panel;
+ private GraphPlugin _plugin;
+
+ public AddTableAtQursorToGraph(IApplication app, PluginResources resources, GraphPlugin plugin)
+ {
+ super(app, resources);
+ _plugin = plugin;
+ }
+
+ public void setSQLPanel(ISQLPanelAPI panel)
+ {
+ _panel = panel;
+ setEnabled(null != _panel && _panel.isInMainSessionWindow());
+ }
+
+ /**
+ * View the Object at cursor in the Object Tree
+ *
+ * @param evt Event being executed.
+ */
+ public synchronized void actionPerformed(ActionEvent evt)
+ {
+ if (_panel == null)
+ {
+ return;
+ }
+
+ String stringAtCursor = _panel.getSQLEntryPanel().getWordAtCursor();
+
+ TableQualifier tq = new TableQualifier(stringAtCursor);
+
+ ITableInfo[] tableInfos = _panel.getSession().getSchemaInfo().getITableInfos(tq.getCatalog(), tq.getSchema(), tq.getTableName());
+
+ if(0 == tableInfos.length)
+ {
+ JOptionPane.showMessageDialog(_panel.getSQLEntryPanel().getTextComponent(), s_stringMgr.getString("graph.AddTableAtQursorToGraph.noTable", stringAtCursor));
+ }
+
+ TableToGraph.sendToGraph(_plugin, _panel.getSession(), new TableToAddWrapper(tableInfos[0]));
+ }
+
+}
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 2012-01-05 19:36:06 UTC (rev 6555)
+++ trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/AddToGraphAction.java 2012-01-07 18:34:30 UTC (rev 6556)
@@ -6,7 +6,6 @@
import net.sourceforge.squirrel_sql.client.session.mainpanel.objecttree.ObjectTreeNode;
import net.sourceforge.squirrel_sql.client.IApplication;
import net.sourceforge.squirrel_sql.fw.util.Resources;
-import net.sourceforge.squirrel_sql.fw.sql.DatabaseObjectType;
import java.awt.event.ActionEvent;
@@ -35,45 +34,7 @@
if (_session != null)
{
ObjectTreeNode[] selectedNodes = _session.getSessionSheet().getObjectTreePanel().getSelectedNodes();
-
- Positioner positioner = new Positioner();
- GraphController toAddTo = null;
-
- for (int i = 0; i < selectedNodes.length; i++)
- {
- if (selectedNodes[i].getDatabaseObjectType() == DatabaseObjectType.TABLE) ;
- {
- if (null == toAddTo)
- {
- GraphController[] controllers = _plugin.getGraphControllers(_session);
- if (0 == controllers.length)
- {
- toAddTo = _plugin.createNewGraphControllerForSession(_session, false);
- }
- else
- {
- GraphSelectionDialogController dlg = new GraphSelectionDialogController(controllers, _session.getApplication().getMainFrame());
- dlg.doModal();
-
- if(false == dlg.isOK())
- {
- return;
- }
- if(null == dlg.getSelectedController())
- {
- toAddTo = _plugin.createNewGraphControllerForSession(_session, false);
- }
- else
- {
- toAddTo = dlg.getSelectedController();
- }
- }
- }
-
- toAddTo.addTable(selectedNodes[i], positioner);
- }
-
- }
+ TableToGraph.sendToGraph(_plugin, _session, TableToAddWrapper.wrap(selectedNodes));
}
}
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 2012-01-05 19:36:06 UTC (rev 6555)
+++ trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/GraphController.java 2012-01-07 18:34:30 UTC (rev 6556)
@@ -383,11 +383,11 @@
- public void addTable(ObjectTreeNode selectedNode, final Positioner positioner)
+ public void addTable(TableToAddWrapper toAddWrapper, final Positioner positioner)
{
- String catalog = selectedNode.getDatabaseObjectInfo().getCatalogName();
- String schema = selectedNode.getDatabaseObjectInfo().getSchemaName();
- String table = selectedNode.getDatabaseObjectInfo().getSimpleName();
+ String catalog = toAddWrapper.getCatalogName();
+ String schema = toAddWrapper.getSchemaName();
+ String table = toAddWrapper.getSimpleName();
addTableIntern(positioner, table, schema, catalog, null);
}
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 2012-01-05 19:36:06 UTC (rev 6555)
+++ trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/GraphPlugin.java 2012-01-07 18:34:30 UTC (rev 6556)
@@ -22,12 +22,15 @@
import net.sourceforge.squirrel_sql.client.action.ActionCollection;
import net.sourceforge.squirrel_sql.client.plugin.*;
import net.sourceforge.squirrel_sql.client.session.IObjectTreeAPI;
+import net.sourceforge.squirrel_sql.client.session.ISQLPanelAPI;
import net.sourceforge.squirrel_sql.client.session.ISession;
import net.sourceforge.squirrel_sql.fw.id.IIdentifier;
import net.sourceforge.squirrel_sql.fw.sql.DatabaseObjectType;
import net.sourceforge.squirrel_sql.fw.util.log.ILogger;
import net.sourceforge.squirrel_sql.fw.util.log.LoggerController;
-import net.sourceforge.squirrel_sql.plugins.graph.link.*;
+import net.sourceforge.squirrel_sql.plugins.graph.link.CopyGraphAction;
+import net.sourceforge.squirrel_sql.plugins.graph.link.LinkGraphAction;
+import net.sourceforge.squirrel_sql.plugins.graph.link.PasteGraphAction;
import net.sourceforge.squirrel_sql.plugins.graph.xmlbeans.GraphXmlSerializer;
import java.util.ArrayList;
@@ -150,6 +153,7 @@
coll.add(new LinkGraphAction(app, _resources, this));
coll.add(new CopyGraphAction(app, _resources, this));
coll.add(new PasteGraphAction(app, _resources, this));
+ coll.add(new AddTableAtQursorToGraph(app, _resources, this));
}
/**
@@ -189,10 +193,10 @@
_grapControllersBySessionID.put(session.getIdentifier(), controllers);
- IObjectTreeAPI api = session.getSessionInternalFrame().getObjectTreeAPI();
+ IObjectTreeAPI objectTreeAPI = session.getSessionInternalFrame().getObjectTreeAPI();
ActionCollection coll = getApplication().getActionCollection();
- api.addToPopup(DatabaseObjectType.TABLE, coll.get(AddToGraphAction.class));
+ objectTreeAPI.addToPopup(DatabaseObjectType.TABLE, coll.get(AddToGraphAction.class));
session.addSeparatorToToolbar();
session.addToToolbar(coll.get(NewQueryBuilderWindowAction.class));
@@ -200,6 +204,9 @@
session.addToToolbar(coll.get(CopyGraphAction.class));
session.addToToolbar(coll.get(PasteGraphAction.class));
+ ISQLPanelAPI sqlPanelAPI = session.getSessionInternalFrame().getSQLPanelAPI();
+ sqlPanelAPI.addToToolsPopUp("addtograph", coll.get(AddTableAtQursorToGraph.class));
+ sqlPanelAPI.addToSQLEntryAreaMenu(coll.get(AddTableAtQursorToGraph.class));
return new PluginSessionCallbackAdaptor(this);
}
Added: trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/TableToAddWrapper.java
===================================================================
--- trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/TableToAddWrapper.java (rev 0)
+++ trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/TableToAddWrapper.java 2012-01-07 18:34:30 UTC (rev 6556)
@@ -0,0 +1,84 @@
+package net.sourceforge.squirrel_sql.plugins.graph;
+
+import net.sourceforge.squirrel_sql.client.session.mainpanel.objecttree.ObjectTreeNode;
+import net.sourceforge.squirrel_sql.fw.sql.DatabaseObjectType;
+import net.sourceforge.squirrel_sql.fw.sql.ITableInfo;
+
+class TableToAddWrapper
+{
+
+ private ObjectTreeNode _objectTreeNode;
+ private ITableInfo _tableInfo;
+
+ public TableToAddWrapper(ObjectTreeNode objectTreeNode)
+ {
+ _objectTreeNode = objectTreeNode;
+ }
+
+ public TableToAddWrapper(ITableInfo tableInfo)
+ {
+ _tableInfo = tableInfo;
+ }
+
+ public static TableToAddWrapper[] wrap(ObjectTreeNode[] objectTreeNodes)
+ {
+ TableToAddWrapper[] ret = new TableToAddWrapper[objectTreeNodes.length];
+
+ for (int i = 0; i < objectTreeNodes.length; i++)
+ {
+ ret[i] = new TableToAddWrapper(objectTreeNodes[i]);
+
+ }
+
+ return ret;
+ }
+
+ public boolean isTable()
+ {
+ if (null != _objectTreeNode)
+ {
+ return _objectTreeNode.getDatabaseObjectType() == DatabaseObjectType.TABLE;
+ }
+ else
+ {
+ return true;
+ }
+ }
+
+ public String getCatalogName()
+ {
+ if (null != _objectTreeNode)
+ {
+ return _objectTreeNode.getDatabaseObjectInfo().getCatalogName();
+ }
+ else
+ {
+ return _tableInfo.getCatalogName();
+ }
+ }
+
+ public String getSchemaName()
+ {
+ if (null != _objectTreeNode)
+ {
+ return _objectTreeNode.getDatabaseObjectInfo().getSchemaName();
+ }
+ else
+ {
+ return _tableInfo.getSchemaName();
+ }
+ }
+
+ public String getSimpleName()
+ {
+ if (null != _objectTreeNode)
+ {
+ return _objectTreeNode.getDatabaseObjectInfo().getSimpleName();
+ }
+ else
+ {
+ return _tableInfo.getSimpleName();
+ }
+ }
+
+}
Added: trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/TableToGraph.java
===================================================================
--- trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/TableToGraph.java (rev 0)
+++ trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/TableToGraph.java 2012-01-07 18:34:30 UTC (rev 6556)
@@ -0,0 +1,51 @@
+package net.sourceforge.squirrel_sql.plugins.graph;
+
+import net.sourceforge.squirrel_sql.client.session.ISession;
+import net.sourceforge.squirrel_sql.client.session.mainpanel.objecttree.ObjectTreeNode;
+
+public class TableToGraph
+{
+
+ public static void sendToGraph(GraphPlugin plugin, ISession session, TableToAddWrapper... toAdd)
+ {
+ Positioner positioner = new Positioner();
+ GraphController toAddTo = null;
+
+ for (int i = 0; i < toAdd.length; i++)
+ {
+ if (toAdd[i].isTable()) ;
+ {
+ if (null == toAddTo)
+ {
+ GraphController[] controllers = plugin.getGraphControllers(session);
+ if (0 == controllers.length)
+ {
+ toAddTo = plugin.createNewGraphControllerForSession(session, false);
+ }
+ else
+ {
+ GraphSelectionDialogController dlg = new GraphSelectionDialogController(controllers, session.getApplication().getMainFrame());
+ dlg.doModal();
+
+ if(false == dlg.isOK())
+ {
+ return;
+ }
+ if(null == dlg.getSelectedController())
+ {
+ toAddTo = plugin.createNewGraphControllerForSession(session, false);
+ }
+ else
+ {
+ toAddTo = dlg.getSelectedController();
+ }
+ }
+ }
+
+ toAddTo.addTable(toAdd[i], positioner);
+ }
+ }
+ }
+
+
+}
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 2012-01-05 19:36:06 UTC (rev 6555)
+++ trunk/sql12/plugins/graph/src/main/resources/net/sourceforge/squirrel_sql/plugins/graph/I18NStrings.properties 2012-01-07 18:34:30 UTC (rev 6556)
@@ -234,4 +234,6 @@
graph.link.linkDetailsMsg=Link {0} points to Graph {1} in file:
graph.link.linkDetailsMsg2=The link itself is placed in:
-graph.copyGraph=Copy Graph
\ No newline at end of file
+graph.copyGraph=Copy Graph
+
+graph.AddTableAtQursorToGraph.noTable=Could not find a table named:{0}
\ No newline at end of file
Modified: trunk/sql12/plugins/graph/src/main/resources/net/sourceforge/squirrel_sql/plugins/graph/graph.properties
===================================================================
--- trunk/sql12/plugins/graph/src/main/resources/net/sourceforge/squirrel_sql/plugins/graph/graph.properties 2012-01-05 19:36:06 UTC (rev 6555)
+++ trunk/sql12/plugins/graph/src/main/resources/net/sourceforge/squirrel_sql/plugins/graph/graph.properties 2012-01-07 18:34:30 UTC (rev 6556)
@@ -32,7 +32,11 @@
action.net.sourceforge.squirrel_sql.plugins.graph.link.PasteGraphAction.tooltip=Paste Graph from an other or the same Session
action.net.sourceforge.squirrel_sql.plugins.graph.link.PasteGraphAction.image=pasteGraph.png
+action.net.sourceforge.squirrel_sql.plugins.graph.AddTableAtQursorToGraph.image=
+action.net.sourceforge.squirrel_sql.plugins.graph.AddTableAtQursorToGraph.name=Add to Graph
+action.net.sourceforge.squirrel_sql.plugins.graph.AddTableAtQursorToGraph.tooltip=Add table at cursor to Graph
+
#action.net.sourceforge.squirrel_sql.plugins.graph.link.CutGraphAction.name=Cut Graph
#action.net.sourceforge.squirrel_sql.plugins.graph.link.CutGraphAction.tooltip=Cut Graph to paste to another Session
#action.net.sourceforge.squirrel_sql.plugins.graph.link.CutGraphAction.image=cutGraph.png
@@ -66,6 +70,9 @@
menuitem.net.sourceforge.squirrel_sql.plugins.graph.link.PasteGraphAction.accelerator=
menuitem.net.sourceforge.squirrel_sql.plugins.graph.link.PasteGraphAction.mnemonic=
+menuitem.net.sourceforge.squirrel_sql.plugins.graph.AddTableAtQursorToGraph.accelerator=
+menuitem.net.sourceforge.squirrel_sql.plugins.graph.AddTableAtQursorToGraph.mnemonic=
+
#menuitem.net.sourceforge.squirrel_sql.plugins.graph.link.CutGraphAction.accelerator=
#menuitem.net.sourceforge.squirrel_sql.plugins.graph.link.CutGraphAction.mnemonic=
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ger...@us...> - 2012-01-05 19:36:17
|
Revision: 6555
http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=6555&view=rev
Author: gerdwagner
Date: 2012-01-05 19:36:06 +0000 (Thu, 05 Jan 2012)
Log Message:
-----------
3026995 Fixed problem in squirrel-sql.bat for 64-bit windows
Modified Paths:
--------------
trunk/sql12/doc/src/main/resources/changes.txt
trunk/sql12/installer/squirrelsql-launcher/src/main/resources/squirrel-sql.bat
Modified: trunk/sql12/doc/src/main/resources/changes.txt
===================================================================
--- trunk/sql12/doc/src/main/resources/changes.txt 2012-01-04 20:36:28 UTC (rev 6554)
+++ trunk/sql12/doc/src/main/resources/changes.txt 2012-01-05 19:36:06 UTC (rev 6555)
@@ -14,7 +14,12 @@
With this feature it is possible to work with shared repositories of Graphs.
+Bug fixes:
+3026995 Fixed problem in squirrel-sql.bat for 64-bit windows.
+
+
+
3.3.0 (11/20/2011)
==================
Modified: trunk/sql12/installer/squirrelsql-launcher/src/main/resources/squirrel-sql.bat
===================================================================
--- trunk/sql12/installer/squirrelsql-launcher/src/main/resources/squirrel-sql.bat 2012-01-04 20:36:28 UTC (rev 6554)
+++ trunk/sql12/installer/squirrelsql-launcher/src/main/resources/squirrel-sql.bat 2012-01-05 19:36:06 UTC (rev 6555)
@@ -1,7 +1,7 @@
@echo off
@rem IZPACK_JAVA is filtered in by the IzPack installer when this script is installed
-set IZPACK_JAVA=%JAVA_HOME%
+set IZPACK_JAVA="%JAVA_HOME%"
@rem We detect the java executable to use according to the following algorithm:
@rem
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ger...@us...> - 2012-01-04 20:36:38
|
Revision: 6554
http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=6554&view=rev
Author: gerdwagner
Date: 2012-01-04 20:36:28 +0000 (Wed, 04 Jan 2012)
Log Message:
-----------
Graphs can be copied and pasted
Modified Paths:
--------------
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/action/ActionCollection.java
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/SessionPanel.java
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/doc/src/main/resources/changes.txt
trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/xml/XMLBeanWriter.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/GraphDesktopListener.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/GraphPluginResources.java
trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/link/LinkGraphController.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/window/GraphWindowController.java
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/xmlbeans/GraphXmlSerializer.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
trunk/sql12/plugins/graph/src/main/resources/net/sourceforge/squirrel_sql/plugins/graph/graph.properties
trunk/sql12/plugins/graph/src/main/resources/net/sourceforge/squirrel_sql/plugins/graph/window/I18NStrings.properties
trunk/sql12/plugins/graph/src/main/resources/net/sourceforge/squirrel_sql/plugins/graph/xmlbeans/I18NStrings.properties
Added Paths:
-----------
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/action/IMainPanelTabAction.java
trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/link/CopyGraphAction.java
trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/link/PasteGraphAction.java
trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/xmlbeans/DefaultGraphXmlSerializerConfig.java
trunk/sql12/plugins/graph/src/main/resources/net/sourceforge/squirrel_sql/plugins/graph/images/copyGraph.png
trunk/sql12/plugins/graph/src/main/resources/net/sourceforge/squirrel_sql/plugins/graph/images/cutGraph.png
trunk/sql12/plugins/graph/src/main/resources/net/sourceforge/squirrel_sql/plugins/graph/images/pasteGraph.png
trunk/sql12/plugins/graph/src/main/resources/net/sourceforge/squirrel_sql/plugins/graph/images/pasteGraphLink.png
Modified: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/action/ActionCollection.java
===================================================================
--- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/action/ActionCollection.java 2012-01-03 11:42:05 UTC (rev 6553)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/action/ActionCollection.java 2012-01-04 20:36:28 UTC (rev 6554)
@@ -244,8 +244,6 @@
* This function should be called whenever an internal frame is
* activated.
*
- * JASON: Should this be in Sessionmanager or SessionWindowmanager?
- *
* @param frame The <TT>JInternalFrame</TT> activated.
*/
public synchronized void activationChanged(IWidget frame)
@@ -275,6 +273,12 @@
{
((IObjectTreeAction)act).setObjectTree(((ObjectTreeInternalFrame)frame).getObjectTreePanel());
}
+
+ if(isSessionInternalFrame && act instanceof IMainPanelTabAction)
+ {
+ ((IMainPanelTabAction)act).setSelectedMainPanelTab(session.getSelectedMainTab());
+ }
+
if ((isSessionInternalFrame) && (act instanceof ISQLPanelAction))
{
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 2012-01-03 11:42:05 UTC (rev 6553)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/session/MainPanel.java 2012-01-04 20:36:28 UTC (rev 6554)
@@ -19,7 +19,7 @@
* 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.*;
import java.beans.PropertyChangeEvent;
import java.beans.PropertyChangeListener;
import java.util.ArrayList;
@@ -51,9 +51,7 @@
*/
public class MainPanel extends JPanel
{
- private static final long serialVersionUID = 1L;
-
- /**
+ /**
* IDs of tabs.
*/
public interface ITabIndexes
@@ -305,9 +303,26 @@
private void updateState()
{
+ int idx = _tabPnl.getSelectedIndex();
+ if (idx != -1)
+ {
+ (_tabs.get(idx)).select();
+ }
_session.getApplication().getActionCollection().activationChanged(_session.getSessionInternalFrame());
}
+ public IMainPanelTab getSelectedMainTab()
+ {
+ int idx = _tabPnl.getSelectedIndex();
+ if (idx == -1)
+ {
+ return null;
+ }
+
+ return _tabs.get(idx);
+ }
+
+
/**
* The passed session is closing so tell each tab.
*
@@ -367,11 +382,6 @@
_tabPnl.requestFocusInWindow();
updateState();
- int idx = _tabPnl.getSelectedIndex();
- if (idx != -1)
- {
- (_tabs.get(idx)).select();
- }
}
ObjectTreePanel getObjectTreePanel()
Modified: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/session/SessionPanel.java
===================================================================
--- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/session/SessionPanel.java 2012-01-03 11:42:05 UTC (rev 6553)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/session/SessionPanel.java 2012-01-04 20:36:28 UTC (rev 6554)
@@ -242,7 +242,13 @@
return _mainTabPane.getTabbedPane().getSelectedIndex();
}
+ public IMainPanelTab getSelectedMainTab()
+ {
+ return _mainTabPane.getSelectedMainTab();
+ }
+
+
/**
* Add a tab to the main tabbed panel.
*
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 2012-01-03 11:42:05 UTC (rev 6553)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/ISession.java 2012-01-04 20:36:28 UTC (rev 6554)
@@ -390,4 +390,8 @@
* @return A new connection for the alias of the current session.
*/
public SQLConnection createUnmanagedConnection();
+
+ boolean isSessionWidgetActive();
+
+ IMainPanelTab getSelectedMainTab();
}
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 2012-01-03 11:42:05 UTC (rev 6553)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/Session.java 2012-01-04 20:36:28 UTC (rev 6554)
@@ -651,7 +651,14 @@
return _sessionSheet.getSelectedMainTabIndex();
}
+ @Override
+ public IMainPanelTab getSelectedMainTab()
+ {
+ return _sessionSheet.getSelectedMainTab();
+ }
+
+
/**
* Add a tab to the main tabbed panel.
*
@@ -865,7 +872,7 @@
public ISQLPanelAPI getSQLPanelAPIOfActiveSessionWindow()
{
ISQLPanelAPI sqlPanelAPI;
- if(_activeActiveSessionWindow instanceof SessionInternalFrame)
+ if(isSessionWidgetActive())
{
sqlPanelAPI = ((SessionInternalFrame)_activeActiveSessionWindow).getSQLPanelAPI();
}
@@ -881,6 +888,11 @@
return sqlPanelAPI;
}
+ public boolean isSessionWidgetActive()
+ {
+ return _activeActiveSessionWindow instanceof SessionInternalFrame;
+ }
+
/**
*
* @throws IllegalStateException if ActiveSessionWindow doesn't provide an IObjectTreeAPI
@@ -889,7 +901,7 @@
public IObjectTreeAPI getObjectTreeAPIOfActiveSessionWindow()
{
IObjectTreeAPI objectTreeAPI;
- if(_activeActiveSessionWindow instanceof SessionInternalFrame)
+ if(isSessionWidgetActive())
{
objectTreeAPI = ((SessionInternalFrame)_activeActiveSessionWindow).getObjectTreeAPI();
}
Copied: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/action/IMainPanelTabAction.java (from rev 6549, trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/action/ISQLPanelAction.java)
===================================================================
--- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/action/IMainPanelTabAction.java (rev 0)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/action/IMainPanelTabAction.java 2012-01-04 20:36:28 UTC (rev 6554)
@@ -0,0 +1,9 @@
+package net.sourceforge.squirrel_sql.client.session.action;
+
+
+import net.sourceforge.squirrel_sql.client.session.mainpanel.IMainPanelTab;
+
+public interface IMainPanelTabAction extends ISessionAction
+{
+ void setSelectedMainPanelTab(IMainPanelTab selectedMainTab);
+}
Modified: trunk/sql12/doc/src/main/resources/changes.txt
===================================================================
--- trunk/sql12/doc/src/main/resources/changes.txt 2012-01-03 11:42:05 UTC (rev 6553)
+++ trunk/sql12/doc/src/main/resources/changes.txt 2012-01-04 20:36:28 UTC (rev 6554)
@@ -7,6 +7,9 @@
Enhancements:
Graph Plugin:
+ Graphs can be copied and pasted.
+
+Graph Plugin:
New Session toolbar button to create links to Graphs of other JDBC-URLs or to Graphs that are placed arbitrary directories.
With this feature it is possible to work with shared repositories of Graphs.
Modified: trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/xml/XMLBeanWriter.java
===================================================================
--- trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/xml/XMLBeanWriter.java 2012-01-03 11:42:05 UTC (rev 6553)
+++ trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/xml/XMLBeanWriter.java 2012-01-04 20:36:28 UTC (rev 6554)
@@ -18,24 +18,21 @@
* 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.n3.nanoxml.IXMLElement;
+import net.n3.nanoxml.XMLElement;
+import net.n3.nanoxml.XMLWriter;
+import net.sourceforge.squirrel_sql.fw.util.FileWrapper;
+import net.sourceforge.squirrel_sql.fw.util.beanwrapper.StringWrapper;
+
import java.beans.BeanInfo;
import java.beans.IntrospectionException;
import java.beans.Introspector;
import java.beans.PropertyDescriptor;
-import java.io.BufferedOutputStream;
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.IOException;
+import java.io.*;
import java.lang.reflect.Method;
import java.util.Iterator;
-import net.n3.nanoxml.IXMLElement;
-import net.n3.nanoxml.XMLElement;
-import net.n3.nanoxml.XMLWriter;
-
-import net.sourceforge.squirrel_sql.fw.util.FileWrapper;
-import net.sourceforge.squirrel_sql.fw.util.beanwrapper.StringWrapper;
-
public final class XMLBeanWriter
{
private IXMLElement _rootElement;
@@ -111,6 +108,24 @@
}
}
+ public String getAsString() throws IOException
+ {
+ StringWriter sw = new StringWriter();
+ BufferedWriter bw = new BufferedWriter(sw);
+
+ new XMLWriter(bw).write(_rootElement, true);
+
+ bw.flush();
+ sw.flush();
+
+ bw.close();
+
+ sw.close();
+
+ return sw.toString();
+ }
+
+
private IXMLElement createElement(Object bean, String name) throws XMLException
{
IXMLElement elem = null;
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 2012-01-03 11:42:05 UTC (rev 6553)
+++ trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/GraphController.java 2012-01-04 20:36:28 UTC (rev 6554)
@@ -6,6 +6,7 @@
import net.sourceforge.squirrel_sql.fw.sql.ITableInfo;
import net.sourceforge.squirrel_sql.fw.util.StringManager;
import net.sourceforge.squirrel_sql.fw.util.StringManagerFactory;
+import net.sourceforge.squirrel_sql.plugins.graph.link.CopyGraphAction;
import net.sourceforge.squirrel_sql.plugins.graph.link.LinkManager;
import net.sourceforge.squirrel_sql.plugins.graph.querybuilder.WhereTreeNodeStructure;
import net.sourceforge.squirrel_sql.plugins.graph.window.TabToWindowHandler;
@@ -36,7 +37,7 @@
private GraphXmlSerializer _xmlSerializer;
private boolean _lazyLoadDone;
- public GraphController(ISession session, GraphPlugin plugin, final GraphXmlSerializer xmlSerializer, boolean showDndDesktopImageAtStartup)
+ public GraphController(ISession session, GraphPlugin plugin, final GraphXmlSerializer xmlSerializer, boolean showDndDesktopImageAtStartup, boolean selectTab)
{
_session = session;
_plugin = plugin;
@@ -135,12 +136,18 @@
{
onShowLinkDetails();
}
+
+ @Override
+ public void copyGraph()
+ {
+ onCopyGraph();
+ }
};
if(null == xmlSerializer)
{
- _xmlSerializer = new GraphXmlSerializer(_plugin, _session, _tabToWindowHandler.getTitle(), null);
+ _xmlSerializer = new GraphXmlSerializer(_plugin, _session, null);
}
else
{
@@ -161,7 +168,7 @@
};
GraphControllerXmlBean graphControllerXmlBean = null;
- if(null != xmlSerializer)
+ if(_xmlSerializer.isLoadable())
{
graphControllerXmlBean = _xmlSerializer.read();
_tabToWindowHandler.setTitle(graphControllerXmlBean.getTitle());
@@ -181,7 +188,7 @@
}
else
{
- _tabToWindowHandler.setTitle(_plugin.patchName(_tabToWindowHandler.getTitle(), _session));
+ _tabToWindowHandler.setTitle(_xmlSerializer.getTitle());
_panelController.initMode(Mode.DEFAULT, null, null, false, null, null, null);
}
@@ -196,9 +203,14 @@
onLazyLoadTables(finalGraphControllerXmlBean);
}
};
- _tabToWindowHandler.showGraph(lazyLoadListener);
+ _tabToWindowHandler.showGraph(lazyLoadListener, selectTab);
}
+ private void onCopyGraph()
+ {
+ CopyGraphAction.copyGraph(this);
+ }
+
private void onShowLinkDetails()
{
JPanel pnl = new JPanel(new GridBagLayout());
@@ -213,10 +225,23 @@
gbc = new GridBagConstraints(0,0,1,1,0,0,GridBagConstraints.NORTHWEST, GridBagConstraints.NONE, new Insets(0,0,0,0),0,0);
pnl.add(new JLabel(msg), gbc);
- gbc = new GridBagConstraints(0,1,1,1,0,0,GridBagConstraints.NORTHWEST, GridBagConstraints.NONE, new Insets(0,0,0,0),0,0);
+ gbc = new GridBagConstraints(0,1,1,1,0,0,GridBagConstraints.NORTHWEST, GridBagConstraints.NONE, new Insets(5,0,0,0),0,0);
JTextField textField = new JTextField(_xmlSerializer.getLinkXmlBean().getFilePathOfLinkedGraph());
textField.setEditable(false);
pnl.add(textField, gbc);
+
+
+ String msg2 = s_stringMgr.getString("graph.link.linkDetailsMsg2");
+ gbc = new GridBagConstraints(0,2,1,1,0,0,GridBagConstraints.NORTHWEST, GridBagConstraints.NONE, new Insets(15,0,0,0),0,0);
+ pnl.add(new JLabel(msg2), gbc);
+
+ gbc = new GridBagConstraints(0,3,1,1,0,0,GridBagConstraints.NORTHWEST, GridBagConstraints.NONE, new Insets(5,0,0,0),0,0);
+ JTextField textField2 = new JTextField(_xmlSerializer.getLinkFile());
+ textField2.setEditable(false);
+ pnl.add(textField2, gbc);
+
+
+
JOptionPane.showMessageDialog(GUIUtils.getOwningFrame(_tabToWindowHandler.getComponent()), pnl);
}
@@ -318,7 +343,7 @@
_xmlSerializer.write(xmlBean);
}
- private GraphControllerXmlBean createXmlBean()
+ public GraphControllerXmlBean createXmlBean()
{
GraphControllerXmlBean xmlBean = new GraphControllerXmlBean();
xmlBean.setTitle(_tabToWindowHandler.getTitle());
@@ -541,5 +566,10 @@
_panelController.getModeManager().setMode(Mode.QUERY_BUILDER);
_tabToWindowHandler.showInWindowBesidesObjectTree();
}
+
+ public boolean isMyGraphMainPanelTab(GraphMainPanelTab graphMainPanelTab)
+ {
+ return _tabToWindowHandler.isMyGraphMainPanelTab(graphMainPanelTab);
+ }
}
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 2012-01-03 11:42:05 UTC (rev 6553)
+++ trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/GraphDesktopController.java 2012-01-04 20:36:28 UTC (rev 6554)
@@ -45,7 +45,9 @@
//
////////////////////////////////////
+ private JMenuItem _mnuCopyGraph;
+
private JMenuItem _mnuRefreshAllTables;
private JMenuItem _mnuScriptAllTables;
private JMenuItem _mnuSelectAllTables;
@@ -202,7 +204,17 @@
createGraphSavingMenus();
}
+ _mnuCopyGraph= new JMenuItem(s_stringMgr.getString("graph.copyGraph"));
+ _mnuCopyGraph.setIcon(_graphPluginResources.getIcon(GraphPluginResources.IKeys.COPY_GRAPH));
+ _mnuCopyGraph.addActionListener(new ActionListener()
+ {
+ public void actionPerformed(ActionEvent e)
+ {
+ onCopyGraph();
+ }
+ });
+
// i18n[graph.refreshAllTables=Refresh all tables]
_mnuRefreshAllTables = new JMenuItem(s_stringMgr.getString("graph.refreshAllTables"));
_mnuRefreshAllTables.addActionListener(new ActionListener()
@@ -328,6 +340,8 @@
_popUp.add(_mnuRemoveGraph);
}
_popUp.add(new JSeparator());
+ _popUp.add(_mnuCopyGraph);
+ _popUp.add(new JSeparator());
_popUp.add(_mnuRefreshAllTables);
_popUp.add(_mnuScriptAllTables);
_popUp.add(new JSeparator());
@@ -587,8 +601,14 @@
_listener.showLinkDetails();
}
+ private void onCopyGraph()
+ {
+ _listener.copyGraph();
+ }
+
+
private void maybeShowPopup(MouseEvent e)
{
if (e.isPopupTrigger())
Modified: trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/GraphDesktopListener.java
===================================================================
--- trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/GraphDesktopListener.java 2012-01-03 11:42:05 UTC (rev 6553)
+++ trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/GraphDesktopListener.java 2012-01-04 20:36:28 UTC (rev 6554)
@@ -38,4 +38,6 @@
void removeLink();
void showLinkDetails();
+
+ void copyGraph();
}
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 2012-01-03 11:42:05 UTC (rev 6553)
+++ trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/GraphMainPanelTab.java 2012-01-04 20:36:28 UTC (rev 6554)
@@ -28,7 +28,7 @@
_tabComponent = new JPanel(new BorderLayout(3,0));
_tabComponent.setOpaque(false);
- _lblTitle = new JLabel(s_stringMgr.getString("graph.newGraph"));
+ _lblTitle = new JLabel();
_lblTitle.setOpaque(false);
if(isLink)
{
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 2012-01-03 11:42:05 UTC (rev 6553)
+++ trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/GraphPlugin.java 2012-01-04 20:36:28 UTC (rev 6554)
@@ -27,7 +27,7 @@
import net.sourceforge.squirrel_sql.fw.sql.DatabaseObjectType;
import net.sourceforge.squirrel_sql.fw.util.log.ILogger;
import net.sourceforge.squirrel_sql.fw.util.log.LoggerController;
-import net.sourceforge.squirrel_sql.plugins.graph.link.LinkGraphAction;
+import net.sourceforge.squirrel_sql.plugins.graph.link.*;
import net.sourceforge.squirrel_sql.plugins.graph.xmlbeans.GraphXmlSerializer;
import java.util.ArrayList;
@@ -148,6 +148,8 @@
coll.add(new AddToGraphAction(app, _resources, this));
coll.add(new NewQueryBuilderWindowAction(app, _resources, this));
coll.add(new LinkGraphAction(app, _resources, this));
+ coll.add(new CopyGraphAction(app, _resources, this));
+ coll.add(new PasteGraphAction(app, _resources, this));
}
/**
@@ -173,14 +175,14 @@
for (int i = 0; i < serializers.length; i++)
{
- controllers.add(new GraphController(session, this, serializers[i], false));
+ controllers.add(new GraphController(session, this, serializers[i], false, false));
}
GraphXmlSerializer[] linkedSerializers = GraphXmlSerializer.getLinkedGraphXmSerializers(this, session);
for (int i = 0; i < linkedSerializers.length; i++)
{
- controllers.add(new GraphController(session, this, linkedSerializers[i], false));
+ controllers.add(new GraphController(session, this, linkedSerializers[i], false, false));
}
@@ -195,6 +197,8 @@
session.addSeparatorToToolbar();
session.addToToolbar(coll.get(NewQueryBuilderWindowAction.class));
session.addToToolbar(coll.get(LinkGraphAction.class));
+ session.addToToolbar(coll.get(CopyGraphAction.class));
+ session.addToToolbar(coll.get(PasteGraphAction.class));
return new PluginSessionCallbackAdaptor(this);
@@ -216,6 +220,24 @@
return _grapControllersBySessionID.get(session.getIdentifier()).toArray(new GraphController[0]);
}
+ public GraphController getGraphControllerForMainTab(GraphMainPanelTab mainTab, ISession session)
+ {
+ GraphController[] graphControllers = getGraphControllers(session);
+
+
+ GraphController graphController = null;
+ for (GraphController g : graphControllers)
+ {
+ if(g.isMyGraphMainPanelTab(mainTab))
+ {
+ graphController = g;
+ break;
+ }
+ }
+ return graphController;
+ }
+
+
public String patchName(String name, ISession session)
{
@@ -235,7 +257,7 @@
while(true)
{
boolean incremented = false;
- for (int i = 0; i < controllers.size(); i++)
+ for (int i = 0; null != controllers && i < controllers.size(); i++)
{
if(0 == postfix)
{
@@ -273,15 +295,18 @@
public GraphController createNewGraphControllerForSession(ISession session, boolean showDndDesktopImageAtStartup)
{
- return _createNewGraphControllerForSession(session, null, showDndDesktopImageAtStartup);
+ return _createNewGraphControllerForSession(session, null, showDndDesktopImageAtStartup, false);
}
- public void createNewGraphControllerForSession(ISession session, GraphXmlSerializer graphXmlSerializer)
+ public void createNewGraphControllerForSession(ISession session, GraphXmlSerializer graphXmlSerializer, boolean selectTab)
{
- _createNewGraphControllerForSession(session, graphXmlSerializer, false);
+ _createNewGraphControllerForSession(session, graphXmlSerializer, false, selectTab);
}
- private GraphController _createNewGraphControllerForSession(ISession session, GraphXmlSerializer graphXmlSerializer, boolean showDndDesktopImageAtStartup)
+ private GraphController _createNewGraphControllerForSession(ISession session,
+ GraphXmlSerializer graphXmlSerializer,
+ boolean showDndDesktopImageAtStartup,
+ boolean selectTab)
{
ArrayList<GraphController> controllers = _grapControllersBySessionID.get(session.getIdentifier());
@@ -290,7 +315,7 @@
controllers = new ArrayList<GraphController>();
_grapControllersBySessionID.put(session.getIdentifier(), controllers);
}
- GraphController ret = new GraphController(session, this, graphXmlSerializer, showDndDesktopImageAtStartup);
+ GraphController ret = new GraphController(session, this, graphXmlSerializer, showDndDesktopImageAtStartup, selectTab);
controllers.add(ret);
_grapControllersBySessionID.put(session.getIdentifier(), controllers);
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 2012-01-03 11:42:05 UTC (rev 6553)
+++ trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/GraphPluginResources.java 2012-01-04 20:36:28 UTC (rev 6554)
@@ -48,5 +48,7 @@
String DND = "dnd";
String ESCAPE_DATE = "escapedate";
String LINK = "link";
+ String COPY_GRAPH = "copyGraph";
+ String PASTE_GRAPH = "pasteGraph";
}
}
Copied: trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/link/CopyGraphAction.java (from rev 6550, trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/link/LinkGraphAction.java)
===================================================================
--- trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/link/CopyGraphAction.java (rev 0)
+++ trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/link/CopyGraphAction.java 2012-01-04 20:36:28 UTC (rev 6554)
@@ -0,0 +1,80 @@
+package net.sourceforge.squirrel_sql.plugins.graph.link;
+
+import net.sourceforge.squirrel_sql.client.IApplication;
+import net.sourceforge.squirrel_sql.client.action.SquirrelAction;
+import net.sourceforge.squirrel_sql.client.plugin.PluginResources;
+import net.sourceforge.squirrel_sql.client.session.ISession;
+import net.sourceforge.squirrel_sql.client.session.action.IMainPanelTabAction;
+import net.sourceforge.squirrel_sql.client.session.mainpanel.IMainPanelTab;
+import net.sourceforge.squirrel_sql.fw.xml.XMLBeanWriter;
+import net.sourceforge.squirrel_sql.plugins.graph.GraphController;
+import net.sourceforge.squirrel_sql.plugins.graph.GraphMainPanelTab;
+import net.sourceforge.squirrel_sql.plugins.graph.GraphPlugin;
+import net.sourceforge.squirrel_sql.plugins.graph.xmlbeans.GraphControllerXmlBean;
+
+import java.awt.*;
+import java.awt.datatransfer.StringSelection;
+import java.awt.event.ActionEvent;
+
+public class CopyGraphAction extends SquirrelAction implements IMainPanelTabAction
+{
+ private GraphPlugin _graphPlugin;
+ private ISession _session;
+ private GraphMainPanelTab _selectedMainTab;
+
+ public CopyGraphAction(IApplication app, PluginResources resources, GraphPlugin graphPlugin)
+ {
+ super(app, resources);
+ _graphPlugin = graphPlugin;
+ }
+
+ @Override
+ public void actionPerformed(ActionEvent e)
+ {
+ if (null == _session || null == _selectedMainTab)
+ {
+ return;
+ }
+
+ GraphController graphController = _graphPlugin.getGraphControllerForMainTab(_selectedMainTab, _session);
+
+ copyGraph(graphController);
+ }
+
+ public static void copyGraph(GraphController graphController)
+ {
+ try
+ {
+ GraphControllerXmlBean xmlBean = graphController.createXmlBean();
+ xmlBean.set32Converted(true);
+
+ final StringSelection ss = new StringSelection(new XMLBeanWriter(xmlBean).getAsString());
+ Toolkit.getDefaultToolkit().getSystemClipboard().setContents(ss, ss);
+ }
+ catch (Exception e)
+ {
+ throw new RuntimeException(e);
+ }
+ }
+
+ @Override
+ public void setSession(ISession session)
+ {
+ _session = session;
+ }
+
+ @Override
+ public void setSelectedMainPanelTab(IMainPanelTab selectedMainTab)
+ {
+ if (selectedMainTab instanceof GraphMainPanelTab)
+ {
+ _selectedMainTab = (GraphMainPanelTab) selectedMainTab;
+ setEnabled(true);
+ }
+ else
+ {
+ _selectedMainTab = null;
+ setEnabled(false);
+ }
+ }
+}
Modified: trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/link/LinkGraphController.java
===================================================================
--- trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/link/LinkGraphController.java 2012-01-03 11:42:05 UTC (rev 6553)
+++ trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/link/LinkGraphController.java 2012-01-04 20:36:28 UTC (rev 6554)
@@ -5,12 +5,12 @@
import net.sourceforge.squirrel_sql.client.session.event.SessionEvent;
import net.sourceforge.squirrel_sql.fw.datasetviewer.DataSetException;
import net.sourceforge.squirrel_sql.fw.datasetviewer.JavabeanArrayDataSet;
-import net.sourceforge.squirrel_sql.fw.sql.ISQLAlias;
import net.sourceforge.squirrel_sql.fw.util.*;
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.xmlbeans.DefaultGraphXmlSerializerConfig;
import net.sourceforge.squirrel_sql.plugins.graph.xmlbeans.GraphXmlSerializer;
import javax.swing.*;
@@ -23,17 +23,10 @@
import java.io.FilenameFilter;
import java.io.IOException;
import java.util.ArrayList;
-import java.util.HashMap;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
import java.util.prefs.Preferences;
-/**
- * Created by IntelliJ IDEA.
- * User: gerd
- * Date: 27.11.11
- * Time: 11:55
- */
public class LinkGraphController
{
private static final StringManager s_stringMgr = StringManagerFactory.getStringManager(LinkGraphDialog.class);
@@ -146,7 +139,7 @@
@Override
public boolean accept(File dir, String name)
{
- if (name.startsWith(GraphXmlSerializer.LINK_PREFIX))
+ if (name.startsWith(DefaultGraphXmlSerializerConfig.LINK_PREFIX))
{
return true;
}
@@ -193,8 +186,11 @@
bw.save(pathOfLinkXmlFile.getAbsolutePath());
- _plugin.createNewGraphControllerForSession(_session, new GraphXmlSerializer(_plugin, _session, linkXmlBean, pathOfLinkXmlFile.getAbsolutePath()));
+ GraphXmlSerializer graphXmlSerializer =
+ new GraphXmlSerializer(_plugin, _session, linkXmlBean, pathOfLinkXmlFile.getAbsolutePath());
+ _plugin.createNewGraphControllerForSession(_session, graphXmlSerializer, false);
+
}
onWindowClosing();
@@ -210,8 +206,9 @@
private String createLinkFileName(GraphFileDisplayBean gdb)
{
return
- GraphXmlSerializer.LINK_PREFIX +
- GraphUtil.createGraphFileName(_session.getAlias().getUrl(), _plugin.patchName(gdb.getLoadedName(), _session));
+ DefaultGraphXmlSerializerConfig.LINK_PREFIX +
+ GraphUtil.createGraphFileName(_session.getAlias().getUrl(), _plugin.patchName(gdb.getLoadedName(), _session)) +
+ DefaultGraphXmlSerializerConfig.XML_BEAN_POSTFIX;
}
private void onHomeDir()
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-01-03 11:42:05 UTC (rev 6553)
+++ trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/link/LinkGraphDialog.java 2012-01-04 20:36:28 UTC (rev 6554)
@@ -116,18 +116,18 @@
GridBagConstraints gbc;
+
gbc = new GridBagConstraints(0, 0, 1, 1, 1, 1, GridBagConstraints.NORTHWEST, GridBagConstraints.HORIZONTAL, new Insets(5, 5, 5, 5), 0, 0);
- btnExplore = new JButton(s_stringMgr.getString("linkGraph.dialog.openFolderInExplorer"));
- pnl.add(btnExplore, gbc);
-
- gbc = new GridBagConstraints(1, 0, 1, 1, 1, 1, GridBagConstraints.NORTHWEST, GridBagConstraints.HORIZONTAL, new Insets(5, 5, 5, 5), 0, 0);
btnChangeDir = new JButton(s_stringMgr.getString("linkGraph.dialog.changeFolder"));
pnl.add(btnChangeDir, gbc);
- gbc = new GridBagConstraints(2, 0, 1, 1, 1, 1, GridBagConstraints.NORTHWEST, GridBagConstraints.HORIZONTAL, new Insets(5, 5, 5, 5), 0, 0);
+ gbc = new GridBagConstraints(1, 0, 1, 1, 1, 1, GridBagConstraints.NORTHWEST, GridBagConstraints.HORIZONTAL, new Insets(5, 5, 5, 5), 0, 0);
btnHomeDir = new JButton(s_stringMgr.getString("linkGraph.dialog.toHomeDir"));
pnl.add(btnHomeDir, gbc);
+ gbc = new GridBagConstraints(2, 0, 1, 1, 1, 1, GridBagConstraints.NORTHWEST, GridBagConstraints.HORIZONTAL, new Insets(5, 5, 5, 5), 0, 0);
+ btnExplore = new JButton(s_stringMgr.getString("linkGraph.dialog.openFolderInExplorer"));
+ pnl.add(btnExplore, gbc);
return pnl;
Added: trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/link/PasteGraphAction.java
===================================================================
--- trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/link/PasteGraphAction.java (rev 0)
+++ trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/link/PasteGraphAction.java 2012-01-04 20:36:28 UTC (rev 6554)
@@ -0,0 +1,99 @@
+package net.sourceforge.squirrel_sql.plugins.graph.link;
+
+import net.sourceforge.squirrel_sql.client.IApplication;
+import net.sourceforge.squirrel_sql.client.action.SquirrelAction;
+import net.sourceforge.squirrel_sql.client.plugin.PluginResources;
+import net.sourceforge.squirrel_sql.client.session.ISession;
+import net.sourceforge.squirrel_sql.client.session.action.ISessionAction;
+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.graph.GraphPlugin;
+import net.sourceforge.squirrel_sql.plugins.graph.xmlbeans.GraphControllerXmlBean;
+import net.sourceforge.squirrel_sql.plugins.graph.xmlbeans.GraphXmlSerializer;
+
+import java.awt.*;
+import java.awt.datatransfer.DataFlavor;
+import java.awt.event.ActionEvent;
+import java.io.File;
+import java.io.FileWriter;
+
+public class PasteGraphAction extends SquirrelAction implements ISessionAction
+{
+ private final static ILogger s_log = LoggerController.createLogger(PasteGraphAction.class);
+
+ private GraphPlugin _plugin;
+ private ISession _session;
+
+ public PasteGraphAction(IApplication app, PluginResources resources, GraphPlugin plugin)
+ {
+ super(app, resources);
+ _plugin = plugin;
+ }
+
+ @Override
+ public void actionPerformed(ActionEvent e)
+ {
+ try
+ {
+ if(null == _session)
+ {
+ return;
+ }
+
+ String data = (String) Toolkit.getDefaultToolkit().getSystemClipboard().getData(DataFlavor.stringFlavor);
+
+
+ File graphTmp = File.createTempFile("graphTmp_", "_.xml");
+
+ FileWriter fw = new FileWriter(graphTmp);
+ fw.write(data);
+ fw.flush();
+ fw.close();
+
+
+ XMLBeanReader br = new XMLBeanReader();
+ try
+ {
+ br.load(graphTmp, this.getClass().getClassLoader());
+ }
+ catch (Exception exc)
+ {
+ _session.showWarningMessage("Could not interpret clipboard as Graph: " + exc.getMessage());
+ s_log.warn("Could not interpret clipboard as Graph: ", exc);
+ return;
+ }
+
+
+ GraphControllerXmlBean bean = (GraphControllerXmlBean) br.iterator().next();
+
+ String title = _plugin.patchName(bean.getTitle(), _session);
+
+ if(false == title.equals(bean.getTitle()))
+ {
+ bean.setTitle(title);
+
+ XMLBeanWriter xbw = new XMLBeanWriter(bean);
+ xbw.save(graphTmp);
+ }
+
+ String graphFile = graphTmp.getAbsolutePath();
+ GraphXmlSerializer graphXmlSerializer = new GraphXmlSerializer(_plugin, _session, graphFile);
+
+ _plugin.createNewGraphControllerForSession(_session, graphXmlSerializer, true);
+ }
+ catch (Exception exc)
+ {
+ throw new RuntimeException(exc);
+ }
+
+ }
+
+ @Override
+ public void setSession(ISession session)
+ {
+ _session = session;
+ }
+
+}
Modified: trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/window/GraphWindowController.java
===================================================================
--- trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/window/GraphWindowController.java 2012-01-03 11:42:05 UTC (rev 6553)
+++ trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/window/GraphWindowController.java 2012-01-04 20:36:28 UTC (rev 6554)
@@ -4,10 +4,12 @@
import net.sourceforge.squirrel_sql.client.session.ISession;
import net.sourceforge.squirrel_sql.client.session.event.SessionAdapter;
import net.sourceforge.squirrel_sql.client.session.event.SessionEvent;
-import net.sourceforge.squirrel_sql.fw.gui.GUIUtils;
import net.sourceforge.squirrel_sql.fw.util.StringManager;
import net.sourceforge.squirrel_sql.fw.util.StringManagerFactory;
import net.sourceforge.squirrel_sql.plugins.graph.GraphMainPanelTab;
+import net.sourceforge.squirrel_sql.plugins.graph.GraphPlugin;
+import net.sourceforge.squirrel_sql.plugins.graph.GraphPluginResources;
+import net.sourceforge.squirrel_sql.plugins.graph.link.CopyGraphAction;
import javax.swing.*;
import java.awt.*;
@@ -23,6 +25,7 @@
private ISession _session;
+ private GraphPlugin _plugin;
private GraphMainPanelTab _graphMainPanelTab;
private int _tabIdx;
private GraphWindowControllerListener _listener;
@@ -30,6 +33,7 @@
private JCheckBox _chkStayOnTop;
private JButton _btnReturn;
private JButton _btnRemove;
+ private JButton _btnCopyGraph;
private JPanel _contentPanel;
private JDialog _dlgWindow;
@@ -38,14 +42,16 @@
private WindowAdapter _windowAdapter;
- public GraphWindowController(ISession session,
- GraphMainPanelTab graphMainPanelTab,
- int tabIdx,
- Rectangle tabBoundsOnScreen,
- GraphWindowControllerListener listener,
+ public GraphWindowController(ISession session,
+ GraphPlugin plugin,
+ GraphMainPanelTab graphMainPanelTab,
+ int tabIdx,
+ Rectangle tabBoundsOnScreen,
+ GraphWindowControllerListener listener,
boolean link)
{
_session = session;
+ _plugin = plugin;
_graphMainPanelTab = graphMainPanelTab;
_tabIdx = tabIdx;
_listener = listener;
@@ -107,8 +113,22 @@
onRemove();
}
});
+
+ _btnCopyGraph.addActionListener(new ActionListener()
+ {
+ @Override
+ public void actionPerformed(ActionEvent e)
+ {
+ onCopyGraph();
+ }
+ });
}
+ private void onCopyGraph()
+ {
+ CopyGraphAction.copyGraph(_plugin.getGraphControllerForMainTab(_graphMainPanelTab, _session));
+ }
+
private String createTitle(GraphMainPanelTab graphMainPanelTab)
{
String ret = graphMainPanelTab.getTitle();
@@ -242,7 +262,14 @@
_btnRemove = new JButton(s_stringMgr.getString("graph.window.removeGraph"));
ret.add(_btnRemove, gbc);
- gbc = new GridBagConstraints(3,0,1,1,1,1,GridBagConstraints.NORTHWEST, GridBagConstraints.NONE, new Insets(5,5,5,5),0,0);
+ gbc = new GridBagConstraints(3,0,1,1,0,0,GridBagConstraints.NORTHWEST, GridBagConstraints.NONE, new Insets(5,5,5,5),0,0);
+ _btnCopyGraph = new JButton(s_stringMgr.getString("graph.window.copyGraph"));
+ _btnCopyGraph.setToolTipText(s_stringMgr.getString("graph.window.copyGraphToolTip"));
+ _btnCopyGraph.setIcon(new GraphPluginResources(_plugin).getIcon(GraphPluginResources.IKeys.COPY_GRAPH));
+
+ ret.add(_btnCopyGraph, gbc);
+
+ gbc = new GridBagConstraints(4,0,1,1,1,1,GridBagConstraints.NORTHWEST, GridBagConstraints.NONE, new Insets(5,5,5,5),0,0);
ret.add(new JPanel(), gbc);
return ret;
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 2012-01-03 11:42:05 UTC (rev 6553)
+++ trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/window/TabToWindowHandler.java 2012-01-04 20:36:28 UTC (rev 6554)
@@ -15,6 +15,7 @@
{
private GraphMainPanelTab _graphMainPanelTab;
private ISession _session;
+ private GraphPlugin _plugin;
private boolean _link;
private GraphWindowController _graphWindowController;
private LazyLoadListener _lazyLoadListener;
@@ -22,6 +23,7 @@
public TabToWindowHandler(GraphPanelController panelController, ISession session, GraphPlugin plugin, boolean isLink)
{
_session = session;
+ _plugin = plugin;
_link = isLink;
_graphMainPanelTab = new GraphMainPanelTab(panelController, plugin, _link);
_graphMainPanelTab.getToWindowButton().addActionListener(new ActionListener()
@@ -64,7 +66,14 @@
}
};
- _graphWindowController = new GraphWindowController(_session, _graphMainPanelTab, tabIdx, tabBoundsOnScreen, listener, _link);
+ _graphWindowController =
+ new GraphWindowController(_session,
+ _plugin,
+ _graphMainPanelTab,
+ tabIdx,
+ tabBoundsOnScreen,
+ listener,
+ _link);
}
private void onWindowClosing(int tabIdx)
@@ -83,11 +92,16 @@
}
- public void showGraph(LazyLoadListener lazyLoadListener)
+ public void showGraph(LazyLoadListener lazyLoadListener, boolean selectTab)
{
_lazyLoadListener = lazyLoadListener;
_graphMainPanelTab.setLazyLoadListener(_lazyLoadListener);
- _session.getSessionSheet().addMainTab(_graphMainPanelTab);
+ int tabIdx = _session.getSessionSheet().addMainTab(_graphMainPanelTab);
+
+ if (selectTab)
+ {
+ _session.getSessionSheet().selectMainTab(tabIdx);
+ }
}
public void removeGraph()
@@ -176,4 +190,9 @@
return _graphWindowController.getComponent();
}
}
+
+ public boolean isMyGraphMainPanelTab(GraphMainPanelTab graphMainPanelTab)
+ {
+ return _graphMainPanelTab == graphMainPanelTab;
+ }
}
Added: 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 (rev 0)
+++ trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/xmlbeans/DefaultGraphXmlSerializerConfig.java 2012-01-04 20:36:28 UTC (rev 6554)
@@ -0,0 +1,241 @@
+package net.sourceforge.squirrel_sql.plugins.graph.xmlbeans;
+
+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.graph.GraphPlugin;
+import net.sourceforge.squirrel_sql.plugins.graph.GraphUtil;
+import net.sourceforge.squirrel_sql.plugins.graph.link.LinkXmlBean;
+
+import java.io.File;
+import java.io.IOException;
+
+public class DefaultGraphXmlSerializerConfig
+{
+ private static final StringManager s_stringMgr = StringManagerFactory.getStringManager(DefaultGraphXmlSerializerConfig.class);
+
+
+ public static final String XML_BEAN_POSTFIX = ".graph.xml";
+ public static final String LINK_PREFIX = "lnk_";
+
+ GraphPlugin _plugin;
+ private ISession _session;
+
+
+ private String _graphFilePath;
+ private LinkXmlBean _linkXmlBean;
+ private String _pathOfLinkXmlFile;
+ private String _title;
+
+
+ public DefaultGraphXmlSerializerConfig(GraphPlugin plugin, ISession session, LinkXmlBean linkXmlBean, String pathOfLinkXmlFile)
+ {
+
+ _linkXmlBean = linkXmlBean;
+ _pathOfLinkXmlFile = pathOfLinkXmlFile;
+ _init(plugin, session, _linkXmlBean.getFilePathOfLinkedGraph());
+ }
+
+ public DefaultGraphXmlSerializerConfig(GraphPlugin plugin, ISession session, String graphFileName)
+ {
+ _init(plugin, session, graphFileName);
+ }
+
+ private void _init(GraphPlugin plugin, ISession session, String graphFileName)
+ {
+ _plugin = plugin;
+ _session = session;
+
+ _title = _plugin.patchName(s_stringMgr.getString("graph.newGraph"), _session);
+
+
+ if (null == graphFileName)
+ {
+ _graphFilePath = generateGraphFilePath(_title);
+ }
+ else
+ {
+ _graphFilePath = graphFileName;
+ }
+ }
+
+ private String generateGraphFilePath(String title)
+ {
+ try
+ {
+ String url = _session.getAlias().getUrl();
+ return getFileName(_plugin.getPluginUserSettingsFolder().getPath(), url, title);
+ }
+ catch (Exception e)
+ {
+ throw new RuntimeException(e);
+ }
+ }
+
+
+ public boolean isLink()
+ {
+ return null != _linkXmlBean;
+ }
+
+ public String getGraphFilePath()
+ {
+ return _graphFilePath;
+ }
+
+ public LinkXmlBean getLinkXmlBean()
+ {
+ return _linkXmlBean;
+ }
+
+ public void renameGraph(String newGraphName)
+ {
+ try
+ {
+ String url = _session.getAlias().getUrl();
+ String newGraphFile = getFileName(_plugin.getPluginUserSettingsFolder().getPath(), url, newGraphName);
+
+ if (new File(_graphFilePath).exists())
+ {
+ if(false == new File(_graphFilePath).renameTo(new File(newGraphFile)))
+ {
+ String msg = "Failed to rename file: " + _graphFilePath;
+ _session.showErrorMessage(msg);
+ throw new IllegalStateException(msg);
+ }
+
+ String[] params = {_graphFilePath, newGraphFile};
+ // i18n[graph.graphRenamed=Renamed "{0}" to "{1}"]
+ _session.showMessage(s_stringMgr.getString("graph.graphRenamed", params));
+ }
+
+ _graphFilePath = newGraphFile;
+ _title = newGraphName;
+ }
+ catch (IOException e)
+ {
+ throw new RuntimeException(e);
+ }
+ }
+
+ public static String getLinkPrefix(ISession session)
+ {
+ return LINK_PREFIX + GraphUtil.javaNormalize(session.getAlias().getUrl()) + ".";
+ }
+
+ private String getFileName(String path, String url, String title)
+ {
+ String graphFileName = GraphUtil.createGraphFileName(url, _plugin.patchName(title, _session));
+ return path + File.separator + graphFileName + XML_BEAN_POSTFIX;
+ }
+
+ public String getTitle()
+ {
+ if (isLink())
+ {
+ return _linkXmlBean.getLinkName();
+ }
+ else
+ {
+ return _title;
+ }
+ }
+
+ public void transformToLocalCopy()
+ {
+ try
+ {
+ String linkName = new File(_pathOfLinkXmlFile).getName();
+ String newGraphsName = linkName.substring(LINK_PREFIX.length(), linkName.length());
+ _graphFilePath = new File(_plugin.getPluginUserSettingsFolder().getPath(), newGraphsName).getAbsolutePath();
+ _linkXmlBean = null;
+ new File(_pathOfLinkXmlFile).delete();
+ _pathOfLinkXmlFile = null;
+ }
+ catch (IOException e)
+ {
+ throw new RuntimeException(e);
+ }
+ }
+
+ public void checkTargetWritable()
+ {
+ if(isLink())
+ {
+ if(false == new File(_graphFilePath).canWrite())
+ {
+ String msg =
+ s_stringMgr.getString("graph.link.cannotWrite",
+ _linkXmlBean.getNameOfLinkedGraph(),
+ _graphFilePath,
+ _pathOfLinkXmlFile);
+
+ _session.getApplication().getMessageHandler().showErrorMessage(msg);
+ throw new IllegalStateException(msg);
+ }
+ }
+ }
+
+ public void removeLink()
+ {
+ if(false == isLink())
+ {
+ throw new IllegalStateException("Not a link");
+ }
+
+
+ if(false == new File(_pathOfLinkXmlFile).delete())
+ {
+ String msg = "Failed to remove link file: " + _pathOfLinkXmlFile;
+ _session.showErrorMessage(msg);
+ throw new IllegalStateException(msg);
+ }
+
+
+ _session.showMessage(s_stringMgr.getString("graph.graphLinkRemoved", _pathOfLinkXmlFile));
+ }
+
+ public void setTitle(String title)
+ {
+ _title = title;
+ _graphFilePath = generateGraphFilePath(title);
+ }
+
+ public boolean isLoadable()
+ {
+ if(isLink() || (null != _graphFilePath && new File(_graphFilePath).exists()))
+ {
+ return true;
+ }
+ else
+ {
+ return false;
+ }
+ }
+
+ public void removeGraphFile()
+ {
+ if (new File(_graphFilePath).exists())
+ {
+ if(false == new File(_graphFilePath).delete())
+ {
+ String msg = "Failed to remove file: " + _graphFilePath;
+ _session.showErrorMessage(msg);
+ throw new IllegalStateException(msg);
+ }
+
+ String[] params = {_graphFilePath};
+ // i18n[graph.graphRemoved=Removed graph file "{0}"]
+ _session.showMessage(s_stringMgr.getString("graph.graphRemoved", params));
+ }
+ }
+
+ public String getPathOfLinkXmlFile()
+ {
+ if(false == isLink())
+ {
+ throw new IllegalStateException("Not a link");
+ }
+ return _pathOfLinkXmlFile;
+ }
+}
\ No newline at end of file
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-01-03 11:42:05 UTC (rev 6553)
+++ trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/xmlbeans/GraphXmlSerializer.java 2012-01-04 20:36:28 UTC (rev 6554)
@@ -24,71 +24,33 @@
private final static ILogger s_log = LoggerController.createLogger(GraphXmlSerializer.class);
-
- private static final String XML_BEAN_POSTFIX = ".graph.xml";
- public static final String LINK_PREFIX = "lnk_";
-
- private GraphPlugin _plugin;
+ private DefaultGraphXmlSerializerConfig _cfg;
private ISession _session;
- private String _graphFile;
- private LinkXmlBean _linkXmlBean;
- private String _pathOfLinkXmlFile;
- public GraphXmlSerializer(GraphPlugin plugin, ISession session, String title, String graphFileName)
+ public GraphXmlSerializer(GraphPlugin plugin, ISession session, String graphFileName)
{
- _init(plugin, session, title, graphFileName);
+ _session = session;
+ _cfg = new DefaultGraphXmlSerializerConfig(plugin, session, graphFileName);
}
public GraphXmlSerializer(GraphPlugin plugin, ISession session, LinkXmlBean linkXmlBean, String pathOfLinkXmlFile)
{
- _linkXmlBean = linkXmlBean;
- _pathOfLinkXmlFile = pathOfLinkXmlFile;
- _init(plugin, session, _linkXmlBean.getLinkName(), _linkXmlBean.getFilePathOfLinkedGraph());
+ _session = session;
+ _cfg = new DefaultGraphXmlSerializerConfig(plugin, session, linkXmlBean, pathOfLinkXmlFile);
}
- private void _init(GraphPlugin plugin, ISession session, String title, String graphFileName)
- {
- try
- {
- _plugin = plugin;
- _session = session;
- String url = _session.getAlias().getUrl();
-
- if(null == graphFileName)
- {
- _graphFile = getFileName(plugin.getPluginUserSettingsFolder().getPath(), url, title);
- }
- else
- {
- _graphFile = graphFileName;
- }
- }
- catch (Exception e)
- {
- throw new RuntimeException(e);
- }
- }
-
public void write(GraphControllerXmlBean xmlBean)
{
try
{
- if(null != _linkXmlBean)
- {
- if(false == new File(_graphFile).canWrite())
- {
- String msg = s_stringMgr.getString("graph.link.cannotWrite", _linkXmlBean.getNameOfLinkedGraph(), _graphFile);
- _session.getApplication().getMessageHandler().showErrorMessage(msg);
- throw new IllegalStateException(msg);
- }
- }
+ _cfg.checkTargetWritable();
Version32Converter.markConverted(xmlBean);
XMLBeanWriter bw = new XMLBeanWriter(xmlBean);
- bw.save(_graphFile);
+ bw.save(_cfg.getGraphFilePath());
- String[] params = {xmlBean.getTitle(), _graphFile};
+ String[] params = {xmlBean.getTitle(), _cfg.getGraphFilePath()};
// i18n[graph.graphSaved=Graph "{0}" saved to "{1}"]
String msg = s_stringMgr.getString("graph.graphSaved", params);
@@ -100,6 +62,7 @@
}
}
+
public void saveLinkAsLocalCopy(GraphControllerXmlBean xmlBean)
{
if(false == isLink())
@@ -107,41 +70,28 @@
throw new IllegalStateException("Not a link");
}
- transformMeFromLinkToLocalCopy();
+ _cfg.transformToLocalCopy();
write(xmlBean);
}
- private void transformMeFromLinkToLocalCopy()
- {
- try
- {
- String linkName = new File(_pathOfLinkXmlFile).getName();
- String newGraphsName = linkName.substring(LINK_PREFIX.length(), linkName.length());
- _graphFile = new File(_plugin.getPluginUserSettingsFolder().getPath(), newGraphsName).getAbsolutePath();
- _linkXmlBean = null;
- new File(_pathOfLinkXmlFile).delete();
- _pathOfLinkXmlFile = null;
- }
- catch (IOException e)
- {
- throw new RuntimeException(e);
- }
- }
-
public GraphControllerXmlBean read()
{
try
{
XMLBeanReader br = new XMLBeanReader();
- br.load(_graphFile, this.getClass().getClassLoader());
+ br.load(_cfg.getGraphFilePath(), this.getClass().getClassLoader());
GraphControllerXmlBean ret = (GraphControllerXmlBean) br.iterator().next();
Version32Converter.convert(ret);
- if(null != _linkXmlBean)
+ if(_cfg.isLink())
{
- ret.setTitle(_linkXmlBean.getLinkName());
+ ret.setTitle(_cfg.getTitle());
}
+ else
+ {
+ _cfg.setTitle(ret.getTitle());
+ }
return ret;
}
@@ -152,36 +102,7 @@
}
- private String getFileName(String path, String url, String title)
- {
- final String filePrefix = GraphUtil.createGraphFileName(url, title);
- File p = new File(path);
- String buf = filePrefix;
- for(int i=1; prefixExists(p, buf); ++i)
- {
- buf = filePrefix + "_" + i ;
- }
-
- return path + File.separator + buf + XML_BEAN_POSTFIX;
- }
-
- private boolean prefixExists(File path, final String filePrefix)
- {
- File[] files = path.listFiles(new FilenameFilter()
- {
- public boolean accept(File dir, String name)
- {
- if(name.toLowerCase().equals(filePrefix.toLowerCase() + XML_BEAN_POSTFIX))
- {
- return true;
- }
- return false;
- }
- });
- return 0 < files.length;
- }
-
public static GraphXmlSerializer[] getGraphXmSerializers(GraphPlugin plugin, ISession session)
{
try
@@ -212,7 +133,7 @@
{
try
{
- final String linkPrefix = LINK_PREFIX + GraphUtil.javaNormalize(session.getAlias().getUrl()) + ".";
+ final String linkPrefix = DefaultGraphXmlSerializerConfig.getLinkPrefix(session);
FileWrapper[] linkXmlFiles = plugin.getPluginUserSettingsFolder().listFiles(new FilenameFilter()
{
@@ -239,7 +160,12 @@
}
else
{
- String msg = s_stringMgr.getString("graph.link.cannotRead", linkXmlBean.getNameOfLinkedGraph(), linkXmlBean.getFilePathOfLinkedGraph());
+ String msg =
+ s_stringMgr.getString("graph.link.cannotRead",
+ linkXmlBean.getNameOfLinkedGraph(),
+ linkXmlBean.getFilePathOfLinkedGraph(),
+ linkXmlFile.getAbsolutePath());
+
session.getApplication().getMessageHandler().showErrorMessage(msg);
s_log.error(msg, new IllegalStateException(msg));
}
@@ -260,7 +186,7 @@
GraphXmlSerializer[] ret = new GraphXmlSerializer[graphXmlFiles.length];
for (int i = 0; i < graphXmlFiles.length; i++)
{
- ret[i] = new GraphXmlSerializer(plugin, session, (String)null, graphXmlFiles[i].getPath());
+ ret[i] = new GraphXmlSerializer(plugin, session, graphXmlFiles[i].getPath());
}
return ret;
@@ -314,15 +240,7 @@
{
try
{
- String url = _session.getAlias().getUrl();
- String newGraphFile = getFileName(_plugin.getPluginUserSettingsFolder().getPath(), url, newName);
...
[truncated message content] |
|
From: <ger...@us...> - 2012-01-03 11:42:11
|
Revision: 6553
http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=6553&view=rev
Author: gerdwagner
Date: 2012-01-03 11:42:05 +0000 (Tue, 03 Jan 2012)
Log Message:
-----------
Updated Italian translation by Meo Bogliolo
Modified Paths:
--------------
trunk/sql12/web-site/paper/SQuirreL_de.pdf
trunk/sql12/web-site/paper/SQuirreL_us.pdf
trunk/sql12/web-site/screenshots.html
Modified: trunk/sql12/web-site/paper/SQuirreL_de.pdf
===================================================================
(Binary files differ)
Modified: trunk/sql12/web-site/paper/SQuirreL_us.pdf
===================================================================
(Binary files differ)
Modified: trunk/sql12/web-site/screenshots.html
===================================================================
--- trunk/sql12/web-site/screenshots.html 2012-01-03 11:14:25 UTC (rev 6552)
+++ trunk/sql12/web-site/screenshots.html 2012-01-03 11:42:05 UTC (rev 6553)
@@ -12,9 +12,10 @@
<P><FONT SIZE=4 STYLE="font-size: 20pt"><B>Introduction, Features and Screen Shots </B></FONT></P>
<P><FONT SIZE=3><B>
- For a more detailed description see the paper by Gerd Wagner and Glenn Griffin:
- <a href="./paper/SQuirreL_us.pdf">English version</a>
- <a href="./paper/SQuirreL_de.pdf">German version</a>
+ For a more detailed description see the paper by Gerd Wagner and Glenn Griffin:<BR>
+ <a href="./paper/SQuirreL_us.pdf">English version</a><BR>
+ <a href="./paper/SQuirreL_de.pdf">German version</a><BR>
+ <a href="./paper/SQuirreL_it.pdf">Italian version</a>, translation by Meo Bogliolo
</B></FONT></P>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ger...@us...> - 2012-01-03 11:14:32
|
Revision: 6552
http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=6552&view=rev
Author: gerdwagner
Date: 2012-01-03 11:14:25 +0000 (Tue, 03 Jan 2012)
Log Message:
-----------
Updated Italian translation by Meo Bogliolo
Modified Paths:
--------------
trunk/sql12/docsrc/paper/SQuirreL_it.odt
Modified: trunk/sql12/docsrc/paper/SQuirreL_it.odt
===================================================================
(Binary files differ)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ger...@us...> - 2011-12-26 14:01:47
|
Revision: 6551
http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=6551&view=rev
Author: gerdwagner
Date: 2011-12-26 14:01:40 +0000 (Mon, 26 Dec 2011)
Log Message:
-----------
Graph link
Modified Paths:
--------------
trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/window/GraphWindowController.java
trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/window/TabToWindowHandler.java
trunk/sql12/plugins/graph/src/main/resources/net/sourceforge/squirrel_sql/plugins/graph/window/I18NStrings.properties
Modified: trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/window/GraphWindowController.java
===================================================================
--- trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/window/GraphWindowController.java 2011-12-25 23:35:39 UTC (rev 6550)
+++ trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/window/GraphWindowController.java 2011-12-26 14:01:40 UTC (rev 6551)
@@ -26,6 +26,7 @@
private GraphMainPanelTab _graphMainPanelTab;
private int _tabIdx;
private GraphWindowControllerListener _listener;
+ private boolean _link;
private JCheckBox _chkStayOnTop;
private JButton _btnReturn;
private JButton _btnRemove;
@@ -37,12 +38,18 @@
private WindowAdapter _windowAdapter;
- public GraphWindowController(ISession session, GraphMainPanelTab graphMainPanelTab, int tabIdx, Rectangle tabBoundsOnScreen, GraphWindowControllerListener listener)
+ public GraphWindowController(ISession session,
+ GraphMainPanelTab graphMainPanelTab,
+ int tabIdx,
+ Rectangle tabBoundsOnScreen,
+ GraphWindowControllerListener listener,
+ boolean link)
{
_session = session;
_graphMainPanelTab = graphMainPanelTab;
_tabIdx = tabIdx;
_listener = listener;
+ _link = link;
_contentPanel = new JPanel(new BorderLayout());
_contentPanel.add(createTopPanel(), BorderLayout.NORTH);
@@ -69,7 +76,7 @@
}
};
- showDialogWindow(tabBoundsOnScreen, graphMainPanelTab.getTitle());
+ showDialogWindow(tabBoundsOnScreen, createTitle(graphMainPanelTab));
_chkStayOnTop.setSelected(true);
@@ -102,6 +109,18 @@
});
}
+ private String createTitle(GraphMainPanelTab graphMainPanelTab)
+ {
+ String ret = graphMainPanelTab.getTitle();
+
+ if(_link)
+ {
+ ret += " " + s_stringMgr.getString("graph.link.linkTitlePostfix");
+ }
+
+ return ret;
+ }
+
private void onSessionClosing(SessionEvent evt)
{
if (evt.getSession() == _session)
@@ -267,4 +286,18 @@
}
}
+
+ public void changedFromLinkToLocalCopy()
+ {
+ _link = false;
+ _graphMainPanelTab.changedFromLinkToLocalCopy();
+ if(null != _dlgWindow)
+ {
+ _dlgWindow.setTitle(createTitle(_graphMainPanelTab));
+ }
+ else
+ {
+ _frameWindow.setTitle(createTitle(_graphMainPanelTab));
+ }
+ }
}
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-12-25 23:35:39 UTC (rev 6550)
+++ trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/window/TabToWindowHandler.java 2011-12-26 14:01:40 UTC (rev 6551)
@@ -15,13 +15,15 @@
{
private GraphMainPanelTab _graphMainPanelTab;
private ISession _session;
+ private boolean _link;
private GraphWindowController _graphWindowController;
private LazyLoadListener _lazyLoadListener;
public TabToWindowHandler(GraphPanelController panelController, ISession session, GraphPlugin plugin, boolean isLink)
{
_session = session;
- _graphMainPanelTab = new GraphMainPanelTab(panelController, plugin, isLink);
+ _link = isLink;
+ _graphMainPanelTab = new GraphMainPanelTab(panelController, plugin, _link);
_graphMainPanelTab.getToWindowButton().addActionListener(new ActionListener()
{
@Override
@@ -62,7 +64,7 @@
}
};
- _graphWindowController = new GraphWindowController(_session, _graphMainPanelTab, tabIdx, tabBoundsOnScreen, listener);
+ _graphWindowController = new GraphWindowController(_session, _graphMainPanelTab, tabIdx, tabBoundsOnScreen, listener, _link);
}
private void onWindowClosing(int tabIdx)
@@ -152,7 +154,15 @@
public void changedFromLinkToLocalCopy()
{
- _graphMainPanelTab.changedFromLinkToLocalCopy();
+ _link = false;
+ if(null == _graphWindowController)
+ {
+ _graphMainPanelTab.changedFromLinkToLocalCopy();
+ }
+ else
+ {
+ _graphWindowController.changedFromLinkToLocalCopy();
+ }
}
public Component getComponent()
Modified: trunk/sql12/plugins/graph/src/main/resources/net/sourceforge/squirrel_sql/plugins/graph/window/I18NStrings.properties
===================================================================
--- trunk/sql12/plugins/graph/src/main/resources/net/sourceforge/squirrel_sql/plugins/graph/window/I18NStrings.properties 2011-12-25 23:35:39 UTC (rev 6550)
+++ trunk/sql12/plugins/graph/src/main/resources/net/sourceforge/squirrel_sql/plugins/graph/window/I18NStrings.properties 2011-12-26 14:01:40 UTC (rev 6551)
@@ -1,3 +1,4 @@
graph.window.return=Return to tab
graph.window.stayOnTop=Stay on top
-graph.window.removeGraph=Remove Graph
\ No newline at end of file
+graph.window.removeGraph=Remove Graph
+graph.link.linkTitlePostfix=<Link>
\ 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: <ger...@us...> - 2011-12-25 23:35:48
|
Revision: 6550
http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=6550&view=rev
Author: gerdwagner
Date: 2011-12-25 23:35:39 +0000 (Sun, 25 Dec 2011)
Log Message:
-----------
Graph link
Modified Paths:
--------------
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/db/DataCache.java
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/SessionPanel.java
trunk/sql12/doc/src/main/resources/changes.txt
trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/datasetviewer/CellDataPopup.java
trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/datasetviewer/ColumnDisplayDefinition.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/JavabeanArrayDataSet.java
trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/gui/GUIUtils.java
trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/sql/SQLUtilities.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/GraphDesktopListener.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/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/GraphUtil.java
trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/TableFrameController.java
trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/nondbconst/ConfigureNonDbConstraintController.java
trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/window/GraphWindowController.java
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/xmlbeans/GraphXmlSerializer.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
trunk/sql12/plugins/graph/src/main/resources/net/sourceforge/squirrel_sql/plugins/graph/graph.properties
trunk/sql12/plugins/graph/src/main/resources/net/sourceforge/squirrel_sql/plugins/graph/xmlbeans/I18NStrings.properties
Added Paths:
-----------
trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/datasetviewer/BeanPorpertyColumnDisplayDefinition.java
trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/NonExistentingTableInfoPlaceHolder.java
trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/link/
trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/link/GraphFileDisplayBean.java
trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/link/LinkGraphAction.java
trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/link/LinkGraphController.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/link/LinkManager.java
trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/link/LinkXmlBean.java
trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/link/NameLoadFinishListener.java
trunk/sql12/plugins/graph/src/main/resources/net/sourceforge/squirrel_sql/plugins/graph/images/graph_lnk.png
trunk/sql12/plugins/graph/src/main/resources/net/sourceforge/squirrel_sql/plugins/graph/images/link.png
trunk/sql12/plugins/graph/src/main/resources/net/sourceforge/squirrel_sql/plugins/graph/link/
trunk/sql12/plugins/graph/src/main/resources/net/sourceforge/squirrel_sql/plugins/graph/link/I18NStrings.properties
Modified: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/db/DataCache.java
===================================================================
--- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/db/DataCache.java 2011-11-27 16:31:01 UTC (rev 6549)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/db/DataCache.java 2011-12-25 23:35:39 UTC (rev 6550)
@@ -24,6 +24,7 @@
import java.net.MalformedURLException;
import java.net.URL;
import java.util.ArrayList;
+import java.util.HashMap;
import java.util.Iterator;
import net.sourceforge.squirrel_sql.client.IApplication;
@@ -281,6 +282,30 @@
return _cache.getAllForClass(SQL_ALIAS_IMPL);
}
+ public HashMap<String, ArrayList<ISQLAlias>> aliasesByUrl()
+ {
+ Iterator<ISQLAlias> aliases = aliases();
+
+ HashMap<String, ArrayList<ISQLAlias>> ret = new HashMap<String, ArrayList<ISQLAlias>>();
+
+ while(aliases.hasNext())
+ {
+ ISQLAlias alias = aliases.next();
+
+ ArrayList<ISQLAlias> buf = ret.get(alias.getUrl());
+ if(null == buf)
+ {
+ buf = new ArrayList<ISQLAlias>();
+ buf.add(alias);
+ ret.put(alias.getUrl(), buf);
+ }
+ }
+
+ return ret;
+
+ }
+
+
public void addAlias(ISQLAlias alias) throws DuplicateObjectException
{
_cache.add(alias);
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-11-27 16:31:01 UTC (rev 6549)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/session/MainPanel.java 2011-12-25 23:35:39 UTC (rev 6550)
@@ -268,7 +268,7 @@
}
}
- private int getTabIndex(IMainPanelTab tab)
+ public int getTabIndex(IMainPanelTab tab)
{
int checkIdx;
if(null == tab.getTabComponent())
Modified: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/session/SessionPanel.java
===================================================================
--- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/session/SessionPanel.java 2011-11-27 16:31:01 UTC (rev 6549)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/session/SessionPanel.java 2011-12-25 23:35:39 UTC (rev 6550)
@@ -19,24 +19,7 @@
* 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.Color;
-import java.awt.Font;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-import java.beans.PropertyChangeEvent;
-import java.beans.PropertyChangeListener;
-import java.sql.SQLException;
-import java.util.Vector;
-import javax.swing.Action;
-import javax.swing.JComponent;
-import javax.swing.JPanel;
-import javax.swing.JTabbedPane;
-import javax.swing.event.TreeSelectionEvent;
-import javax.swing.event.TreeSelectionListener;
-import javax.swing.tree.TreePath;
-
import net.sourceforge.squirrel_sql.client.IApplication;
import net.sourceforge.squirrel_sql.client.action.ActionCollection;
import net.sourceforge.squirrel_sql.client.gui.db.SQLAliasColorProperties;
@@ -44,20 +27,7 @@
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.ExecuteSqlAction;
-import net.sourceforge.squirrel_sql.client.session.action.FileAppendAction;
-import net.sourceforge.squirrel_sql.client.session.action.FileCloseAction;
-import net.sourceforge.squirrel_sql.client.session.action.FileNewAction;
-import net.sourceforge.squirrel_sql.client.session.action.FileOpenAction;
-import net.sourceforge.squirrel_sql.client.session.action.FilePrintAction;
-import net.sourceforge.squirrel_sql.client.session.action.FileSaveAction;
-import net.sourceforge.squirrel_sql.client.session.action.FileSaveAsAction;
-import net.sourceforge.squirrel_sql.client.session.action.NextSqlAction;
-import net.sourceforge.squirrel_sql.client.session.action.PreviousSqlAction;
-import net.sourceforge.squirrel_sql.client.session.action.RefreshSchemaInfoAction;
-import net.sourceforge.squirrel_sql.client.session.action.SQLFilterAction;
-import net.sourceforge.squirrel_sql.client.session.action.SelectSqlAction;
-import net.sourceforge.squirrel_sql.client.session.action.SessionPropertiesAction;
+import net.sourceforge.squirrel_sql.client.session.action.*;
import net.sourceforge.squirrel_sql.client.session.mainpanel.IMainPanelTab;
import net.sourceforge.squirrel_sql.client.session.mainpanel.SQLPanel;
import net.sourceforge.squirrel_sql.client.session.mainpanel.objecttree.IObjectTreeListener;
@@ -74,6 +44,18 @@
import net.sourceforge.squirrel_sql.fw.util.log.ILogger;
import net.sourceforge.squirrel_sql.fw.util.log.LoggerController;
+import javax.swing.*;
+import javax.swing.event.TreeSelectionEvent;
+import javax.swing.event.TreeSelectionListener;
+import javax.swing.tree.TreePath;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.beans.PropertyChangeEvent;
+import java.beans.PropertyChangeListener;
+import java.sql.SQLException;
+import java.util.Vector;
+
public class SessionPanel extends JPanel
{
private static final long serialVersionUID = 1L;
@@ -514,7 +496,12 @@
return _mainTabPane.getTabbedPane().getTabCount();
}
+ public int getMainTabIndex(IMainPanelTab mainPanelTab)
+ {
+ return _mainTabPane.getTabIndex(mainPanelTab);
+ }
+
private class MyToolBar extends ToolBar
{
private static final long serialVersionUID = 1L;
Modified: trunk/sql12/doc/src/main/resources/changes.txt
===================================================================
--- trunk/sql12/doc/src/main/resources/changes.txt 2011-11-27 16:31:01 UTC (rev 6549)
+++ trunk/sql12/doc/src/main/resources/changes.txt 2011-12-25 23:35:39 UTC (rev 6550)
@@ -4,7 +4,14 @@
${squirrelsql.changelog.header}
+Enhancements:
+Graph Plugin:
+ New Session toolbar button to create links to Graphs of other JDBC-URLs or to Graphs that are placed arbitrary directories.
+ With this feature it is possible to work with shared repositories of Graphs.
+
+
+
3.3.0 (11/20/2011)
==================
Added: trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/datasetviewer/BeanPorpertyColumnDisplayDefinition.java
===================================================================
--- trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/datasetviewer/BeanPorpertyColumnDisplayDefinition.java (rev 0)
+++ trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/datasetviewer/BeanPorpertyColumnDisplayDefinition.java 2011-12-25 23:35:39 UTC (rev 6550)
@@ -0,0 +1,43 @@
+package net.sourceforge.squirrel_sql.fw.datasetviewer;
+
+import java.beans.PropertyDescriptor;
+
+/**
+ * Created by IntelliJ IDEA.
+ * User: gerd
+ * Date: 01.12.11
+ * Time: 21:04
+ */
+public class BeanPorpertyColumnDisplayDefinition
+{
+ private ColumnDisplayDefinition _colDef;
+ private PropertyDescriptor _propDesc;
+
+ public BeanPorpertyColumnDisplayDefinition(ColumnDisplayDefinition colDef, PropertyDescriptor propDesc)
+ {
+ _colDef = colDef;
+ _propDesc = propDesc;
+ }
+
+ public ColumnDisplayDefinition getColDef()
+ {
+ return _colDef;
+ }
+
+ public PropertyDescriptor getPropDesc()
+ {
+ return _propDesc;
+ }
+
+ public static ColumnDisplayDefinition[] getColDefs(BeanPorpertyColumnDisplayDefinition[] beanPorpertyColumnDisplayDefinitions)
+ {
+ ColumnDisplayDefinition[] ret = new ColumnDisplayDefinition[beanPorpertyColumnDisplayDefinitions.length];
+
+ for (int i = 0; i < beanPorpertyColumnDisplayDefinitions.length; i++)
+ {
+ ret[i] = beanPorpertyColumnDisplayDefinitions[i].getColDef();
+ }
+
+ return ret;
+ }
+}
Modified: trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/datasetviewer/CellDataPopup.java
===================================================================
--- trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/datasetviewer/CellDataPopup.java 2011-11-27 16:31:01 UTC (rev 6549)
+++ trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/datasetviewer/CellDataPopup.java 2011-12-25 23:35:39 UTC (rev 6550)
@@ -20,13 +20,13 @@
import java.awt.*;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
-import java.awt.event.KeyEvent;
import java.awt.event.MouseEvent;
import javax.swing.*;
//import net.sourceforge.squirrel_sql.client.gui.AboutBoxDialog;
import net.sourceforge.squirrel_sql.fw.datasetviewer.cellcomponent.CellComponentFactory;
+import net.sourceforge.squirrel_sql.fw.gui.GUIUtils;
import net.sourceforge.squirrel_sql.fw.util.StringManager;
import net.sourceforge.squirrel_sql.fw.util.StringManagerFactory;
@@ -256,21 +256,9 @@
popup.setUserActionInfo(this, row, col, table);
setContentPane(popup);
- AbstractAction closeAction = new AbstractAction()
- {
-
- public void actionPerformed(ActionEvent actionEvent)
- {
- setVisible(false);
- dispose();
- }
- };
- KeyStroke escapeStroke = KeyStroke.getKeyStroke(KeyEvent.VK_ESCAPE, 0);
- getRootPane().getInputMap(JComponent.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT).put(escapeStroke, "CloseAction");
- getRootPane().getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW).put(escapeStroke, "CloseAction");
- getRootPane().getInputMap(JComponent.WHEN_FOCUSED).put(escapeStroke, "CloseAction");
- getRootPane().getActionMap().put("CloseAction", closeAction);
+ GUIUtils.enableCloseByEscape(this);
}
- }
+ }
+
}
Modified: trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/datasetviewer/ColumnDisplayDefinition.java
===================================================================
--- trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/datasetviewer/ColumnDisplayDefinition.java 2011-11-27 16:31:01 UTC (rev 6549)
+++ trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/datasetviewer/ColumnDisplayDefinition.java 2011-12-25 23:35:39 UTC (rev 6550)
@@ -111,8 +111,10 @@
* registered.
*/
private DialectType _dialectType;
-
- /**
+ private String _userProperty;
+ private Integer _absoluteWidth;
+
+ /**
* Ctor. The dialect type is set to GENERIC, so no plugin-overriding is
* possible when using this constructor.
*
@@ -507,6 +509,25 @@
return getColumnName();
}
}
-
-
+
+
+ public void setUserProperty(String userProperty)
+ {
+ _userProperty = userProperty;
+ }
+
+ public String getUserProperty()
+ {
+ return _userProperty;
+ }
+
+ public void setAsoluteWidth(Integer absoluteWidth)
+ {
+ _absoluteWidth = absoluteWidth;
+ }
+
+ public Integer getAbsoluteWidth()
+ {
+ return _absoluteWidth;
+ }
}
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 2011-11-27 16:31:01 UTC (rev 6549)
+++ trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/datasetviewer/DataSetViewerTablePanel.java 2011-12-25 23:35:39 UTC (rev 6550)
@@ -43,7 +43,6 @@
import javax.swing.table.TableColumnModel;
import net.sourceforge.squirrel_sql.fw.datasetviewer.cellcomponent.CellComponentFactory;
-import net.sourceforge.squirrel_sql.fw.datasetviewer.cellcomponent.DataTypeGeneral;
import net.sourceforge.squirrel_sql.fw.datasetviewer.cellcomponent.RestorableJTextField;
import net.sourceforge.squirrel_sql.fw.gui.ButtonTableHeader;
import net.sourceforge.squirrel_sql.fw.gui.SortableTableModel;
@@ -72,9 +71,15 @@
super();
}
- public void init(IDataSetUpdateableModel updateableModel)
+ public void init(IDataSetUpdateableModel updateableModel)
+ {
+ init(updateableModel, ListSelectionModel.SINGLE_INTERVAL_SELECTION);
+ }
+
+
+ public void init(IDataSetUpdateableModel updateableModel, int listSelectionMode)
{
- _table = new MyJTable(this, updateableModel);
+ _table = new MyJTable(this, updateableModel, listSelectionMode);
_selectionHandler = new DataSetViewerTableListSelectionHandler(_table);
_updateableModel = updateableModel;
}
@@ -171,7 +176,37 @@
return _table.getSelectedRows();
}
+ public int[] getSeletedModelRows()
+ {
+ int[] selectedViewRows = _table.getSelectedRows();
+ int[] ret = new int[selectedViewRows.length];
+
+ for (int i = 0; i < selectedViewRows.length; i++)
+ {
+ ret[i] = (((SortableTableModel)_table.getModel()).transfromToModelRow(selectedViewRows[i]));
+ }
+
+ return ret;
+ }
+
+
+ public int getColumnWidthForHeader(String header)
+ {
+ TableColumnModel columnModel = _table.getColumnModel();
+
+ for (int i = 0; i < columnModel.getColumnCount(); i++)
+ {
+ if(columnModel.getColumn(i).getHeaderValue().equals(header))
+ {
+ return columnModel.getColumn(i).getWidth();
+ }
+ }
+
+ throw new IllegalStateException("No col with header: " + header);
+ }
+
+
/*
* The JTable used for displaying all DB ResultSet info.
*/
@@ -189,7 +224,7 @@
private ButtonTableHeader _tableHeader = new ButtonTableHeader();
MyJTable(IDataSetTableControls creator,
- IDataSetUpdateableModel updateableObject)
+ IDataSetUpdateableModel updateableObject, int listSelectionMode)
{
super(new SortableTableModel(new MyTableModel(creator)));
_creator = creator;
@@ -204,7 +239,7 @@
// the background model is updateable AND we are not already editing
if (updateableObject != null && ! creator.isTableEditable())
allowUpdate = true;
- createGUI(allowUpdate, updateableObject);
+ createGUI(allowUpdate, updateableObject, listSelectionMode);
// just in case table is editable, call creator to set up cell editors
_creator.setCellEditors(this);
@@ -437,17 +472,27 @@
for (int i = 0; i < colDefs.length; ++i)
{
ColumnDisplayDefinition colDef = colDefs[i];
- int colWidth = colDef.getDisplayWidth() * _multiplier;
- if (colWidth > MAX_COLUMN_WIDTH * _multiplier)
- {
- colWidth = MAX_COLUMN_WIDTH * _multiplier;
- }
- else if (colWidth < MIN_COLUMN_WIDTH * _multiplier)
- {
- colWidth = MIN_COLUMN_WIDTH * _multiplier;
- }
- ExtTableColumn col = new ExtTableColumn(i, colWidth,
+ int colWidth;
+
+ if (null == colDef.getAbsoluteWidth())
+ {
+ colWidth = colDef.getDisplayWidth() * _multiplier;
+ if (colWidth > MAX_COLUMN_WIDTH * _multiplier)
+ {
+ colWidth = MAX_COLUMN_WIDTH * _multiplier;
+ }
+ else if (colWidth < MIN_COLUMN_WIDTH * _multiplier)
+ {
+ colWidth = MIN_COLUMN_WIDTH * _multiplier;
+ }
+ }
+ else
+ {
+ colWidth = colDef.getAbsoluteWidth();
+ }
+
+ ExtTableColumn col = new ExtTableColumn(i, colWidth,
CellComponentFactory.getTableCellRenderer(colDefs[i]), null);
String headerValue = colDef.getColumnHeading();
@@ -481,9 +526,9 @@
}
private void createGUI(boolean allowUpdate,
- IDataSetUpdateableModel updateableObject)
+ IDataSetUpdateableModel updateableObject, int selectionMode)
{
- setSelectionMode(ListSelectionModel.SINGLE_INTERVAL_SELECTION);
+ setSelectionMode(selectionMode);
setRowSelectionAllowed(false);
setColumnSelectionAllowed(false);
setCellSelectionEnabled(true);
Modified: trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/datasetviewer/JavabeanArrayDataSet.java
===================================================================
--- trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/datasetviewer/JavabeanArrayDataSet.java 2011-11-27 16:31:01 UTC (rev 6549)
+++ trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/datasetviewer/JavabeanArrayDataSet.java 2011-12-25 23:35:39 UTC (rev 6550)
@@ -23,46 +23,59 @@
import java.beans.PropertyDescriptor;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
+import java.util.*;
+import net.sourceforge.squirrel_sql.fw.util.EmptyIterator;
import net.sourceforge.squirrel_sql.fw.util.IMessageHandler;
-import net.sourceforge.squirrel_sql.fw.util.log.ILogger;
-import net.sourceforge.squirrel_sql.fw.util.log.LoggerController;
public class JavabeanArrayDataSet implements IDataSet
{
- @SuppressWarnings("unused")
- private final ILogger s_log =
- LoggerController.createLogger(JavabeanArrayDataSet.class);
-
private Object[] _currentRow;
private List<Object[]> _data;
- private Iterator<Object[]> _dataIter;
+ private Iterator<Object[]> _dataIter = new EmptyIterator<Object[]>();
- private int _columnCount;
- private DataSetDefinition _dataSetDefinition;
+ private DataSetDefinition _dataSetDefinition;
+ private BeanInfo _info;
+ private Class _beanClass;
+ private BeanPorpertyColumnDisplayDefinition[] _beanPorpertyColumnDisplayDefinitions;
- /**
+ private HashMap<String, String> _headers = new HashMap<String, String>();
+ private HashMap<String, Integer> _positions = new HashMap<String, Integer>();
+ private HashMap<String, Integer> _absoluteWidths = new HashMap<String, Integer>();
+ private HashSet<String> _ignoreProperties = new HashSet<String>();
+
+
+ /**
* @throws IllegalArgumentException
* Thrrown if all objects in <TT>beans</TT> are not the same class.
*/
public JavabeanArrayDataSet(Object[] beans) throws DataSetException
{
- super();
- setJavabeanArray(beans);
+ if (null == beans || 0 == beans.length)
+ {
+ _beanClass = Object.class;
+ }
+ else
+ {
+ _beanClass = beans[0].getClass();
+ }
+ setJavaBeanArray(beans);
}
- /**
+ public JavabeanArrayDataSet(Class beanClass) throws DataSetException
+ {
+ _beanClass = beanClass;
+ }
+
+ /**
* Retrieve the number of columns in this <TT>DataSet</TT>.
*
* @return Number of columns.
*/
public final int getColumnCount()
{
- return _columnCount;
+ return _beanPorpertyColumnDisplayDefinitions.length;
}
public DataSetDefinition getDataSetDefinition()
@@ -92,36 +105,22 @@
return getter.invoke(bean, (Object[])null);
}
- /**
- * @throws IllegalArgumentException
- * Thrrown if all objects in <TT>beans</TT> are not the same class.
- */
- private void setJavabeanArray(Object[] beans) throws DataSetException
+ public void setJavaBeanList(List list) throws DataSetException
+ {
+ setJavaBeanArray(list.toArray(new Object[list.size()]));
+ }
+
+ public void setJavaBeanArray(Object[] beans) throws DataSetException
{
- if (beans == null)
- {
- beans = new Object[0];
- }
+ initColsAndBeanInfo(_beanClass);
if (beans.length > 0)
{
- BeanInfo info = null;
try
{
- info = Introspector.getBeanInfo(beans[0].getClass(), Introspector.USE_ALL_BEANINFO);
- validateBeans(beans);
- initialize(info);
- }
- catch (IntrospectionException ex)
- {
- throw new DataSetException(ex);
- }
-
- try
- {
for (int i = 0; i < beans.length; ++i)
{
- processBeanInfo(beans[i], info);
+ processBeanInfo(beans[i], _info);
}
}
catch (Exception ex)
@@ -132,70 +131,135 @@
}
}
- private void processBeanInfo(Object bean, BeanInfo info)
+ void initColsAndBeanInfo(Class beanClass) throws DataSetException
+ {
+ try
+ {
+ _info = Introspector.getBeanInfo(beanClass, Introspector.USE_ALL_BEANINFO);
+ initializeCols(_info);
+ }
+ catch (IntrospectionException ex)
+ {
+ throw new DataSetException(ex);
+ }
+ }
+
+ private void processBeanInfo(Object bean, BeanInfo info)
throws InvocationTargetException, IllegalAccessException
{
-// BeanInfo[] extra = info.getAdditionalBeanInfo();
-// if (extra != null)
-// {
-// for (int i = 0; i < extra.length; ++i)
-// {
-// processBeanInfo(bean, extra[i]);
-// }
-// }
-
- PropertyDescriptor[] propDesc = info.getPropertyDescriptors();
- Object[] line = new Object[propDesc.length];
- for (int i = 0; i < propDesc.length; ++i)
+ ArrayList line = new ArrayList();
+ for (int i = 0; i < _beanPorpertyColumnDisplayDefinitions.length; ++i)
{
- final Method getter = propDesc[i].getReadMethod();
+ final Method getter = _beanPorpertyColumnDisplayDefinitions[i].getPropDesc().getReadMethod();
if (getter != null)
{
- line[i] = executeGetter(bean, getter);
+ line.add(executeGetter(bean, getter));
}
}
- if (line != null)
- {
- _data.add(line);
- }
+ _data.add(line.toArray(new Object[line.size()]));
}
- private void validateBeans(Object[] beans)
- throws IllegalArgumentException
+ private void initializeCols(BeanInfo info)
{
- if (beans.length > 0)
- {
- final String className = beans[0].getClass().getName();
- for (int i = 1; i < beans.length; ++i)
- {
- if (!beans[i].getClass().getName().equals(className))
- {
- throw new IllegalArgumentException("All beans must be the same Class");
- }
- }
- }
-
- }
-
- private void initialize(BeanInfo info)
- {
_data = new ArrayList<Object[]>();
- ColumnDisplayDefinition[] colDefs = createColumnDefinitions(info, null);
- _dataSetDefinition = new DataSetDefinition(colDefs);
- _columnCount = _dataSetDefinition.getColumnDefinitions().length;
+ _beanPorpertyColumnDisplayDefinitions = createColumnDefinitions(info);
+ _dataSetDefinition = new DataSetDefinition(BeanPorpertyColumnDisplayDefinition.getColDefs(_beanPorpertyColumnDisplayDefinitions));
}
- private ColumnDisplayDefinition[] createColumnDefinitions(BeanInfo info,
- int[] columnWidths)
+ private BeanPorpertyColumnDisplayDefinition[] createColumnDefinitions(BeanInfo info)
{
- PropertyDescriptor[] propDesc = info.getPropertyDescriptors();
- ColumnDisplayDefinition[] columnDefs = new ColumnDisplayDefinition[propDesc.length];
+ PropertyDescriptor[] propDesc = info.getPropertyDescriptors();
+ ArrayList<BeanPorpertyColumnDisplayDefinition> columnDefs = new ArrayList<BeanPorpertyColumnDisplayDefinition>();
for (int i = 0; i < propDesc.length; ++i)
{
- int colWidth = columnWidths != null && columnWidths.length >= i ? columnWidths[i] : 200;
- columnDefs[i] = new ColumnDisplayDefinition(colWidth, propDesc[i].getDisplayName());
+ if(false == isValidProperty(propDesc[i]))
+ {
+ continue;
+ }
+
+ ColumnDisplayDefinition colDef;
+
+
+
+ if (null == _headers.get(propDesc[i].getName()))
+ {
+ colDef = new ColumnDisplayDefinition(200, propDesc[i].getDisplayName());
+ }
+ else
+ {
+ colDef = new ColumnDisplayDefinition(200, _headers.get(propDesc[i].getName()));
+ }
+ colDef.setUserProperty(propDesc[i].getName());
+
+ if(null != _absoluteWidths.get(propDesc[i].getName()))
+ {
+ colDef.setAsoluteWidth(_absoluteWidths.get(propDesc[i].getName()));
+ }
+
+
+ columnDefs.add(new BeanPorpertyColumnDisplayDefinition(colDef, propDesc[i]));
}
- return columnDefs;
+
+ if (0 < _positions.size())
+ {
+ Collections.sort(columnDefs, new Comparator<BeanPorpertyColumnDisplayDefinition>()
+ {
+ @Override
+ public int compare(BeanPorpertyColumnDisplayDefinition o1, BeanPorpertyColumnDisplayDefinition o2)
+ {
+ return comparePosition(o1, o2);
+ }
+ });
+ }
+
+
+ return columnDefs.toArray(new BeanPorpertyColumnDisplayDefinition[columnDefs.size()]);
}
+
+ private int comparePosition(BeanPorpertyColumnDisplayDefinition o1, BeanPorpertyColumnDisplayDefinition o2)
+ {
+ if(null == _positions.get(o1.getColDef().getUserProperty()) && null == _positions.get(o2.getColDef().getUserProperty()))
+ {
+ return 0;
+ }
+ else if(null == _positions.get(o1.getColDef().getUserProperty()) && null != _positions.get(o2.getColDef().getUserProperty()))
+ {
+ return 1;
+ }
+ else if(null != _positions.get(o1.getColDef().getUserProperty()) && null == _positions.get(o2.getColDef().getUserProperty()))
+ {
+ return -1;
+ }
+ else
+ {
+ return _positions.get(o1.getColDef().getUserProperty()).compareTo(_positions.get(o2.getColDef().getUserProperty()));
+ }
+ }
+
+ private boolean isValidProperty(PropertyDescriptor propertyDescriptor)
+ {
+ return false == propertyDescriptor.getReadMethod().getDeclaringClass().equals(Object.class)
+ && false == _ignoreProperties.contains(propertyDescriptor.getName());
+ }
+
+ public void setColHeader(String prop, String header)
+ {
+ _headers.put(prop, header);
+ }
+
+ public void setColPos(String prop, int pos)
+ {
+ _positions.put(prop, pos);
+ }
+
+ public void setAbsoluteWidht(String prop, int width)
+ {
+ _absoluteWidths.put(prop, width);
+ }
+
+ public void setIgnoreProperty(String ignoreProperty)
+ {
+ _ignoreProperties.add(ignoreProperty);
+ }
}
Modified: trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/gui/GUIUtils.java
===================================================================
--- trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/gui/GUIUtils.java 2011-11-27 16:31:01 UTC (rev 6549)
+++ trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/gui/GUIUtils.java 2011-12-25 23:35:39 UTC (rev 6550)
@@ -24,6 +24,8 @@
import javax.swing.*;
import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.KeyEvent;
import java.awt.geom.Rectangle2D;
import java.beans.PropertyVetoException;
import java.lang.reflect.InvocationTargetException;
@@ -481,4 +483,22 @@
}
}
+
+ public static void enableCloseByEscape(final JDialog dialog)
+ {
+ AbstractAction closeAction = new AbstractAction()
+ {
+
+ public void actionPerformed(ActionEvent actionEvent)
+ {
+ dialog.setVisible(false);
+ dialog.dispose();
+ }
+ };
+ KeyStroke escapeStroke = KeyStroke.getKeyStroke(KeyEvent.VK_ESCAPE, 0);
+ dialog.getRootPane().getInputMap(JComponent.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT).put(escapeStroke, "CloseAction");
+ dialog.getRootPane().getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW).put(escapeStroke, "CloseAction");
+ dialog.getRootPane().getInputMap(JComponent.WHEN_FOCUSED).put(escapeStroke, "CloseAction");
+ dialog.getRootPane().getActionMap().put("CloseAction", closeAction);
+ }
}
Modified: trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/sql/SQLUtilities.java
===================================================================
--- trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/sql/SQLUtilities.java 2011-11-27 16:31:01 UTC (rev 6549)
+++ trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/sql/SQLUtilities.java 2011-12-25 23:35:39 UTC (rev 6550)
@@ -386,7 +386,26 @@
}
}
- /**
+ public static String getQualifiedTableName(String catalog, String schema, String tableName)
+ {
+ String ret = "";
+
+ if(null != catalog)
+ {
+ ret += catalog + ".";
+ }
+
+ if(null != schema)
+ {
+ ret += schema + ".";
+ }
+
+ ret += tableName;
+
+ return ret;
+ }
+
+ /**
* @author manningr
*/
private static class TableComparator implements Comparator<ITableInfo>, Serializable
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-11-27 16:31:01 UTC (rev 6549)
+++ trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/GraphController.java 2011-12-25 23:35:39 UTC (rev 6550)
@@ -2,7 +2,11 @@
import net.sourceforge.squirrel_sql.client.session.ISession;
import net.sourceforge.squirrel_sql.client.session.mainpanel.objecttree.ObjectTreeNode;
+import net.sourceforge.squirrel_sql.fw.gui.GUIUtils;
import net.sourceforge.squirrel_sql.fw.sql.ITableInfo;
+import net.sourceforge.squirrel_sql.fw.util.StringManager;
+import net.sourceforge.squirrel_sql.fw.util.StringManagerFactory;
+import net.sourceforge.squirrel_sql.plugins.graph.link.LinkManager;
import net.sourceforge.squirrel_sql.plugins.graph.querybuilder.WhereTreeNodeStructure;
import net.sourceforge.squirrel_sql.plugins.graph.window.TabToWindowHandler;
import net.sourceforge.squirrel_sql.plugins.graph.xmlbeans.*;
@@ -16,6 +20,9 @@
public class GraphController
{
+ private static final StringManager s_stringMgr = StringManagerFactory.getStringManager(GraphController.class);
+
+
private ISession _session;
private GraphPanelController _panelController;
@@ -29,7 +36,7 @@
private GraphXmlSerializer _xmlSerializer;
private boolean _lazyLoadDone;
- public GraphController(ISession session, GraphPlugin plugin, GraphXmlSerializer xmlSerializer, boolean showDndDesktopImageAtStartup)
+ public GraphController(ISession session, GraphPlugin plugin, final GraphXmlSerializer xmlSerializer, boolean showDndDesktopImageAtStartup)
{
_session = session;
_plugin = plugin;
@@ -98,12 +105,39 @@
{
_tabToWindowHandler.toggleWindowTab();
}
+
+ @Override
+ public boolean isLink()
+ {
+ return null != xmlSerializer && xmlSerializer.isLink();
+ }
+
+ @Override
+ public void saveLinkAsLocalCopy()
+ {
+ onSaveLinkAsLocalCopy();
+ }
+
+ @Override
+ public void saveLinkedGraph()
+ {
+ saveGraph();
+ }
+
+ @Override
+ public void removeLink()
+ {
+ onRemoveLink();
+ }
+
+ @Override
+ public void showLinkDetails()
+ {
+ onShowLinkDetails();
+ }
};
- _panelController = new GraphPanelController(_tableFramesModel, _graphDesktopListener, _session, _plugin, showDndDesktopImageAtStartup);
- _tabToWindowHandler = new TabToWindowHandler(_panelController, _session, _plugin);
-
if(null == xmlSerializer)
{
_xmlSerializer = new GraphXmlSerializer(_plugin, _session, _tabToWindowHandler.getTitle(), null);
@@ -113,6 +147,11 @@
_xmlSerializer = xmlSerializer;
}
+ _panelController = new GraphPanelController(_tableFramesModel, _graphDesktopListener, _session, _plugin, showDndDesktopImageAtStartup);
+
+ _tabToWindowHandler = new TabToWindowHandler(_panelController, _session, _plugin, _xmlSerializer.isLink());
+
+
_addTableRequestListener = new AddTableRequestListener()
{
public void addTablesRequest(String[] tablenames, String schema, String catalog)
@@ -160,6 +199,27 @@
_tabToWindowHandler.showGraph(lazyLoadListener);
}
+ private void onShowLinkDetails()
+ {
+ JPanel pnl = new JPanel(new GridBagLayout());
+ GridBagConstraints gbc;
+
+
+ // Link {0} points to Graph {1} in file:
+ String linkName = _xmlSerializer.getLinkXmlBean().getLinkName();
+ String nameOfLinkedGraph = _xmlSerializer.getLinkXmlBean().getNameOfLinkedGraph();
+ String msg = s_stringMgr.getString("graph.link.linkDetailsMsg", linkName, nameOfLinkedGraph);
+
+ gbc = new GridBagConstraints(0,0,1,1,0,0,GridBagConstraints.NORTHWEST, GridBagConstraints.NONE, new Insets(0,0,0,0),0,0);
+ pnl.add(new JLabel(msg), gbc);
+
+ gbc = new GridBagConstraints(0,1,1,1,0,0,GridBagConstraints.NORTHWEST, GridBagConstraints.NONE, new Insets(0,0,0,0),0,0);
+ JTextField textField = new JTextField(_xmlSerializer.getLinkXmlBean().getFilePathOfLinkedGraph());
+ textField.setEditable(false);
+ pnl.add(textField, gbc);
+ JOptionPane.showMessageDialog(GUIUtils.getOwningFrame(_tabToWindowHandler.getComponent()), pnl);
+ }
+
private void onLazyLoadTables(GraphControllerXmlBean graphControllerXmlBean)
{
if(null != graphControllerXmlBean && false == _lazyLoadDone)
@@ -222,6 +282,13 @@
_plugin.removeGraphController(this, _session);
}
+ private void onRemoveLink()
+ {
+ _xmlSerializer.removeLink();
+ _tabToWindowHandler.removeGraph();
+ _plugin.removeGraphController(this, _session);
+ }
+
private void renameGraph(String newName)
{
if(newName.equals(_tabToWindowHandler.getTitle()))
@@ -237,8 +304,22 @@
saveGraph();
}
+ private void onSaveLinkAsLocalCopy()
+ {
+ _xmlSerializer.saveLinkAsLocalCopy(createXmlBean());
+ _panelController.changedFromLinkToLocalCopy();
+ _tabToWindowHandler.changedFromLinkToLocalCopy();
+ }
+
+
public void saveGraph()
{
+ GraphControllerXmlBean xmlBean = createXmlBean();
+ _xmlSerializer.write(xmlBean);
+ }
+
+ private GraphControllerXmlBean createXmlBean()
+ {
GraphControllerXmlBean xmlBean = new GraphControllerXmlBean();
xmlBean.setTitle(_tabToWindowHandler.getTitle());
xmlBean.setShowConstraintNames(_panelController.getDesktopController().isShowConstraintNames());
@@ -258,16 +339,13 @@
for (int i = 0; i < tblCtrls.size(); i++)
{
TableFrameController tableFrameController = tblCtrls.get(i);
- frameXmls[i] = tableFrameController.getXmlBean();
+ frameXmls[i] = tableFrameController.getXmlBean();
}
xmlBean.setTableFrameControllerXmls(frameXmls);
-
- _xmlSerializer.write(xmlBean);
+ return xmlBean;
}
-
-
private void onAddTablesRequest(String[] tablenames, String schema, String catalog)
{
Positioner positioner = new Positioner();
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-11-27 16:31:01 UTC (rev 6549)
+++ trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/GraphDesktopController.java 2011-12-25 23:35:39 UTC (rev 6550)
@@ -27,9 +27,25 @@
private ConstraintView _lastPressedConstraintView;
private JPopupMenu _popUp;
+
+ ////////////////////////////////////
+ // Saving Graph
private JMenuItem _mnuSaveGraph;
private JMenuItem _mnuRenameGraph;
private JMenuItem _mnuRemoveGraph;
+ //
+ ////////////////////////////////////
+
+ ////////////////////////////////////
+ // Saving link
+ private JMenuItem _mnuSaveLinkAsLocalCopy;
+ private JMenuItem _mnuSaveLinkedGraph;
+ private JMenuItem _mnuRemoveLink;
+ private JMenuItem _mnuShowLinkDetails;
+ //
+ ////////////////////////////////////
+
+
private JMenuItem _mnuRefreshAllTables;
private JMenuItem _mnuScriptAllTables;
private JMenuItem _mnuSelectAllTables;
@@ -177,39 +193,17 @@
{
_popUp = new JPopupMenu();
- // i18n[graph.saveGraph=Save graph]
- _mnuSaveGraph = new JMenuItem(s_stringMgr.getString("graph.saveGraph"));
- _mnuSaveGraph.addActionListener(new ActionListener()
+ if (_listener.isLink())
{
- public void actionPerformed(ActionEvent e)
- {
- onSaveGraph();
- }
- });
-
-
- // i18n[graph.renameGraph=Rename graph]
- _mnuRenameGraph= new JMenuItem(s_stringMgr.getString("graph.renameGraph"));
- _mnuRenameGraph.addActionListener(new ActionListener()
+ createLinkSavingMenus();
+ }
+ else
{
- public void actionPerformed(ActionEvent e)
- {
- onRenameGraph();
- }
- });
+ createGraphSavingMenus();
+ }
- // i18n[graph.removeGraph=Remove graph]
- _mnuRemoveGraph= new JMenuItem(s_stringMgr.getString("graph.removeGraph"));
- _mnuRemoveGraph.addActionListener(new ActionListener()
- {
- public void actionPerformed(ActionEvent e)
- {
- onRemoveGraph();
- }
- });
-
- // i18n[graph.refreshAllTables=Refresh all tables]
+ // i18n[graph.refreshAllTables=Refresh all tables]
_mnuRefreshAllTables = new JMenuItem(s_stringMgr.getString("graph.refreshAllTables"));
_mnuRefreshAllTables.addActionListener(new ActionListener()
{
@@ -320,9 +314,19 @@
}
});
- _popUp.add(_mnuSaveGraph);
- _popUp.add(_mnuRenameGraph);
- _popUp.add(_mnuRemoveGraph);
+ if (_listener.isLink())
+ {
+ _popUp.add(_mnuSaveLinkAsLocalCopy);
+ _popUp.add(_mnuSaveLinkedGraph);
+ _popUp.add(_mnuRemoveLink);
+ _popUp.add(_mnuShowLinkDetails);
+ }
+ else
+ {
+ _popUp.add(_mnuSaveGraph);
+ _popUp.add(_mnuRenameGraph);
+ _popUp.add(_mnuRemoveGraph);
+ }
_popUp.add(new JSeparator());
_popUp.add(_mnuRefreshAllTables);
_popUp.add(_mnuScriptAllTables);
@@ -368,6 +372,81 @@
}
+ private void createLinkSavingMenus()
+ {
+ _mnuSaveLinkAsLocalCopy = new JMenuItem(s_stringMgr.getString("graph.saveLinkAsLocalCopy"));
+ _mnuSaveLinkAsLocalCopy.addActionListener(new ActionListener()
+ {
+ public void actionPerformed(ActionEvent e)
+ {
+ onSaveLinkAsLocalCopy();
+ }
+ });
+
+ _mnuSaveLinkedGraph = new JMenuItem(s_stringMgr.getString("graph.saveLinkedGraph"));
+ _mnuSaveLinkedGraph.addActionListener(new ActionListener()
+ {
+ public void actionPerformed(ActionEvent e)
+ {
+ onSaveLinkedGraph();
+ }
+ });
+
+ _mnuRemoveLink = new JMenuItem(s_stringMgr.getString("graph.removeLink"));
+ _mnuRemoveLink.addActionListener(new ActionListener()
+ {
+ public void actionPerformed(ActionEvent e)
+ {
+ onRemoveLink();
+ }
+ });
+
+ _mnuShowLinkDetails = new JMenuItem(s_stringMgr.getString("graph.showLinkDetails"));
+ _mnuShowLinkDetails.setIcon(_graphPluginResources.getIcon(GraphPluginResources.IKeys.LINK));
+
+ _mnuShowLinkDetails.addActionListener(new ActionListener()
+ {
+ public void actionPerformed(ActionEvent e)
+ {
+ onShowLinkDetails();
+ }
+ });
+ }
+
+ private void createGraphSavingMenus()
+ {
+ // i18n[graph.saveGraph=Save graph]
+ _mnuSaveGraph = new JMenuItem(s_stringMgr.getString("graph.saveGraph"));
+ _mnuSaveGraph.addActionListener(new ActionListener()
+ {
+ public void actionPerformed(ActionEvent e)
+ {
+ onSaveGraph();
+ }
+ });
+
+
+ // i18n[graph.renameGraph=Rename graph]
+ _mnuRenameGraph= new JMenuItem(s_stringMgr.getString("graph.renameGraph"));
+ _mnuRenameGraph.addActionListener(new ActionListener()
+ {
+ public void actionPerformed(ActionEvent e)
+ {
+ onRenameGraph();
+ }
+ });
+
+ // i18n[graph.removeGraph=Remove graph]
+ _mnuRemoveGraph= new JMenuItem(s_stringMgr.getString("graph.removeGraph"));
+ _mnuRemoveGraph.addActionListener(new ActionListener()
+ {
+ public void actionPerformed(ActionEvent e)
+ {
+ onRemoveGraph();
+ }
+ });
+ }
+
private void onPopupMenuWillBecomeInvisible()
{
if(null != _currentGraphControllerPopupListener)
@@ -456,15 +535,18 @@
private void onRemoveGraph()
{
- // i18n[graph.delGraph=Do you really wish to delete this graph?]
- Window parent = SwingUtilities.windowForComponent(_desktopPane);
- int res = JOptionPane.showConfirmDialog(parent, s_stringMgr.getString("graph.delGraph"));
- if(res == JOptionPane.YES_OPTION)
+ if(showRemoveOptionPane("graph.delGraph") == JOptionPane.YES_OPTION)
{
_listener.removeRequest();
}
}
+ private int showRemoveOptionPane(String msgKey)
+ {
+ Window parent = SwingUtilities.windowForComponent(_desktopPane);
+ return JOptionPane.showConfirmDialog(parent, s_stringMgr.getString(msgKey));
+ }
+
private void onRenameGraph()
{
@@ -482,6 +564,31 @@
_listener.saveGraphRequested();
}
+ private void onSaveLinkAsLocalCopy()
+ {
+ _listener.saveLinkAsLocalCopy();
+ }
+
+ private void onSaveLinkedGraph()
+ {
+ _listener.saveLinkedGraph();
+ }
+
+ private void onRemoveLink()
+ {
+ if(showRemoveOptionPane("graph.delLink") == JOptionPane.YES_OPTION)
+ {
+ _listener.removeLink();
+ }
+ }
+
+ private void onShowLinkDetails()
+ {
+ _listener.showLinkDetails();
+ }
+
+
+
private void maybeShowPopup(MouseEvent e)
{
if (e.isPopupTrigger())
@@ -726,4 +833,9 @@
{
return _modeManager.getTableFramesModel();
}
+
+ public void changedFromLinkToLocalCopy()
+ {
+ createPopUp();
+ }
}
Modified: trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/GraphDesktopListener.java
===================================================================
--- trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/GraphDesktopListener.java 2011-11-27 16:31:01 UTC (rev 6549)
+++ trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/GraphDesktopListener.java 2011-12-25 23:35:39 UTC (rev 6550)
@@ -26,4 +26,16 @@
void tablesDropped(List<ITableInfo> tis, Point dropPoint);
void toggleWindowTab();
+
+
+
+ boolean isLink();
+
+ void saveLinkAsLocalCopy();
+
+ void saveLinkedGraph();
+
+ void removeLink();
+
+ void showLinkDetails();
}
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-11-27 16:31:01 UTC (rev 6549)
+++ trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/GraphMainPanelTab.java 2011-12-25 23:35:39 UTC (rev 6550)
@@ -22,7 +22,7 @@
private JButton _btnToWindow;
private LazyLoadListener _lazyLoadListener;
- public GraphMainPanelTab(GraphPanelController panelController, GraphPlugin plugin)
+ public GraphMainPanelTab(GraphPanelController panelController, GraphPlugin plugin, boolean isLink)
{
_panelController = panelController;
_tabComponent = new JPanel(new BorderLayout(3,0));
@@ -30,7 +30,13 @@
_lblTitle = new JLabel(s_stringMgr.getString("graph.newGraph"));
_lblTitle.setOpaque(false);
+ if(isLink)
+ {
+ ImageIcon linkIcon = new GraphPluginResources(plugin).getIcon(GraphPluginResources.IKeys.LINK);
+ _lblTitle.setIcon(linkIcon);
+ }
+
_tabComponent.add(_lblTitle, BorderLayout.CENTER);
ImageIcon icon = new GraphPluginResources(plugin).getIcon(GraphPluginResources.IKeys.TO_WINDOW);
@@ -89,4 +95,9 @@
{
_lazyLoadListener = lazyLoadListener;
}
+
+ public void changedFromLinkToLocalCopy()
+ {
+ _lblTitle.setIcon(null);
+ }
}
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-11-27 16:31:01 UTC (rev 6549)
+++ trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/GraphPanelController.java 2011-12-25 23:35:39 UTC (rev 6550)
@@ -148,4 +148,10 @@
{
_graphDesktopController.removeGraph();
}
+
+
+ public void changedFromLinkToLocalCopy()
+ {
+ _graphDesktopController.changedFromLinkToLocalCopy();
+ }
}
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-11-27 16:31:01 UTC (rev 6549)
+++ trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/GraphPlugin.java 2011-12-25 23:35:39 UTC (rev 6550)
@@ -27,11 +27,11 @@
import net.sourceforge.squirrel_sql.fw.sql.DatabaseObjectType;
import net.sourceforge.squirrel_sql.fw.util.log.ILogger;
import net.sourceforge.squirrel_sql.fw.util.log.LoggerController;
+import net.sourceforge.squirrel_sql.plugins.graph.link.LinkGraphAction;
import net.sourceforge.squirrel_sql.plugins.graph.xmlbeans.GraphXmlSerializer;
-import java.util.Arrays;
+import java.util.ArrayList;
import java.util.Hashtable;
-import java.util.Vector;
/**
* The SQL Script plugin class.
@@ -39,7 +39,7 @@
public class GraphPlugin extends DefaultSessionPlugin
{
- private Hashtable<IIdentifier, GraphController[]> _grapControllersBySessionID = new Hashtable<IIdentifier, GraphController[]>();
+ private Hashtable<IIdentifier, ArrayList<GraphController>> _grapControllersBySessionID = new Hashtable<IIdentifier, ArrayList<GraphController>>();
/**
* Logger for this class.
@@ -147,6 +147,7 @@
ActionCollection coll = app.getActionCollection();
coll.add(new AddToGraphAction(app, _resources, this));
coll.add(new NewQueryBuilderWindowAction(app, _resources, this));
+ coll.add(new LinkGraphAction(app, _resources, this));
}
/**
@@ -168,14 +169,21 @@
public PluginSessionCallback sessionStarted(final ISession session)
{
GraphXmlSerializer[] serializers = GraphXmlSerializer.getGraphXmSerializers(this, session);
- GraphController[] controllers = new GraphController[serializers.length];
+ ArrayList<GraphController> controllers = new ArrayList<GraphController>();
- for (int i = 0; i < controllers.length; i++)
+ for (int i = 0; i < serializers.length; i++)
{
- controllers[i] = new GraphController(session, this, serializers[i], false);
+ controllers.add(new GraphController(session, this, serializers[i], false));
}
+ GraphXmlSerializer[] linkedSerializers = GraphXmlSerializer.getLinkedGraphXmSerializers(this, session);
+ for (int i = 0; i < linkedSerializers.length; i++)
+ {
+ controllers.add(new GraphController(session, this, linkedSerializers[i], false));
+ }
+
+
_grapControllersBySessionID.put(session.getIdentifier(), controllers);
@@ -186,6 +194,7 @@
session.addSeparatorToToolbar();
session.addToToolbar(coll.get(NewQueryBuilderWindowAction.class));
+ session.addToToolbar(coll.get(LinkGraphAction.class));
return new PluginSessionCallbackAdaptor(this);
@@ -194,18 +203,17 @@
public void sessionEnding(ISession session)
{
- GraphController[] controllers = _grapControllersBySessionID.remove(session.getIdentifier());
+ ArrayList<GraphController> controllers = _grapControllersBySessionID.remove(session.getIdentifier());
- for (int i = 0; i < controllers.length; i++)
+ for (GraphController controller : controllers)
{
- controllers[i].sessionEnding();
+ controller.sessionEnding();
}
-
}
public GraphController[] getGraphControllers(ISession session)
{
- return _grapControllersBySessionID.get(session.getIdentifier());
+ return _grapControllersBySessionID.get(session.getIdentifier()).toArray(new GraphController[0]);
}
public String patchName(String name, ISession session)
@@ -222,16 +230,16 @@
++postfix;
}
- GraphController[] controllers = _grapControllersBySessionID.get(session.getIdentifier());
+ ArrayList<GraphController> controllers = _grapControllersBySessionID.get(session.getIdentifier());
while(true)
{
boolean incremented = false;
- for (int i = 0; i < controllers.length; i++)
+ for (int i = 0; i < controllers.size(); i++)
{
if(0 == postfix)
{
- if(controllers[i].getTitle().equals(name))
+ if(controllers.get(i).getTitle().equals(name))
{
++postfix;
incremented = true;
@@ -239,7 +247,7 @@
}
else
{
- if(controllers[i].getTitle().equals(name + "_" + postfix))
+ if(controllers.get(i).getTitle().equals(name + "_" + postfix))
{
++postfix;
incremented = true;
@@ -265,36 +273,50 @@
public GraphController createNewGraphControllerForSession(ISession session, boolean showDndDesktopImageAtStartup)
{
- GraphController[] controllers = _grapControllersBySessionID.get(session.getIdentifier());
+ return _createNewGraphControllerForSession(session, null, showDndDesktopImageAtStartup);
+ }
- Vector<GraphController> v = new Vector<GraphController>();
- if(null != controllers)
+ public void createNewGraphControllerForSession(ISession session, GraphXmlSerializer graphXmlSerializer)
+ {
+ _createNewGraphControllerForSession(session, graphXmlSerializer, false);
+ }
+
+ private GraphController _createNewGraphControllerForSession(ISession session, GraphXmlSerializer graphXmlSerializer, boolean showDndDesktopImageAtStartup)
+ {
+ ArrayList<GraphController> controllers = _grapControllersBySessionID.get(session.getIdentifier());
+
+ if(null == controllers)
{
- v.addAll(Arrays.asList(controllers));
+ controllers = new ArrayList<GraphController>();
+ _grapControllersBySessionID.put(session.getIdentifier(), controllers);
}
- GraphController ret = new GraphController(session, this, null, showDndDesktopImageAtStartup);
- v.add(ret);
-
- controllers = v.toArray(new GraphController[v.size()]);
+ GraphController ret = new GraphController(session, this, graphXmlSerializer, showDndDesktopImageAtStartup);
+ controllers.add(ret);
_grapControllersBySessionID.put(session.getIdentifier(), controllers);
return ret;
}
+
+
public void removeGraphController(GraphController toRemove, ISession session)
{
- GraphController[] controllers = _grapControllersBySessionID.get(session.getIdentifier());
- Vector<GraphController> v = new Vector<GraphController>();
- for (int i = 0; i < controllers.length; i++)
+ ArrayList<GraphController> controllers = _grapControllersBySessionID.get(session.getIdentifier());
+
+ if(null == controllers)
{
- if(false == controllers[i].equals(toRemove))
+ return;
+ }
+
+
+ for (int i = 0; i < controllers.size(); i++)
+ {
+ if(controllers.get(i).equals(toRemove))
{
- v.add(controllers[i]);
+ controllers.remove(i);
+ break;
}
}
+ }
- controllers = v.toArray(new GraphController[v.size()]);
- _grapControllersBySessionID.put(session.getIdentifier(), controllers);
-
- }
}
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-11-27 16:31:01 UTC (rev 6549)
+++ trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/GraphPluginResources.java 2011-12-25 23:35:39 UTC (rev 6550)
@@ -47,5 +47,6 @@
String DELETE_FOLDER = "deletefolder";
String DND = "dnd";
String ESCAPE_DATE = "escapedate";
+ String LINK = "link";
}
}
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 2011-11-27 16:31:01 UTC (rev 6549)
+++ trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/GraphUtil.java 2011-12-25 23:35:39 UTC (rev 6550)
@@ -114,4 +114,45 @@
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);
+ }
+
+ public static String createGraphFileNamePrefixForUrl(String url)
+ {
+ return javaNormalize(url) + ".";
+ }
}
Added: trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/NonExistentingTableInfoPlaceHolder.java
===================================================================
--- trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/NonExistentingTableInfoPlaceHolder.java (rev 0)
+++ trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/NonExistentingTableInfoPlaceHolder.java 2011-12-25 23:35:39 UTC (rev 6550)
@@ -0,0 +1,107 @@
+package net.sourceforge.squirrel_sql.plugins.graph;
+
+import net.sourceforge.squirrel_sql.fw.sql.*;
+import net.sourceforge.squirrel_sql.fw.util.StringManager;
+import net.sourceforge.squirrel_sql.fw.util.StringManagerFactory;
+
+public class NonExistentingTableInfoPlaceHolder implements ITableInfo
+{
+ private static final StringManager s_stringMgr =
+ StringManagerFactory.getStringManager(NonExistentingTableInfoPlaceHolder.class);
+
+
+ private String _catalog;
+ private String _schema;
+ private String _tableName;
+
+ public NonExistentingTableInfoPlaceHolder(String catalog, String schema, String tableName)
+ {
+ _catalog = catalog;
+ _schema = schema;
+ _tableName = tableName;
+ }
+
+ @Override
+ public String getType()
+ {
+ return "TABLE";
+ }
+
+ @Override
+ public String getRemarks()
+ {
+ return null;
+ }
+
+ @Override
+ public ITableInfo[] getChildTables()
+ {
+ return new ITableInfo[0];
+ ...
[truncated message content] |
|
From: <man...@us...> - 2011-11-27 16:31:07
|
Revision: 6549
http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=6549&view=rev
Author: manningr
Date: 2011-11-27 16:31:01 +0000 (Sun, 27 Nov 2011)
Log Message:
-----------
Disable all tests, except when either external test profiles are active.
Modified Paths:
--------------
trunk/sql12/squirrelsql-integration-environment/pom.xml
Modified: trunk/sql12/squirrelsql-integration-environment/pom.xml
===================================================================
--- trunk/sql12/squirrelsql-integration-environment/pom.xml 2011-11-26 20:20:33 UTC (rev 6548)
+++ trunk/sql12/squirrelsql-integration-environment/pom.xml 2011-11-27 16:31:01 UTC (rev 6549)
@@ -75,6 +75,34 @@
<target>${javac-target-version}</target>
</configuration>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>default-test</id>
+ <goals>
+ <goal>test</goal>
+ </goals>
+ <configuration>
+ <excludes>
+ <exclude>**/*Test.java</exclude>
+ </excludes>
+ </configuration>
+ </execution>
+ <execution>
+ <id>default-integration-test</id>
+ <goals>
+ <goal>test</goal>
+ </goals>
+ <configuration>
+ <excludes>
+ <exclude>**/*Test.java</exclude>
+ </excludes>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</build>
<dependencies>
@@ -243,22 +271,24 @@
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
+ <artifactId>maven-failsafe-plugin</artifactId>
+ <version>2.10</version>
<executions>
<execution>
- <id>default-test</id>
+ <id>execPluginExternalTests</id>
<goals>
- <goal>test</goal>
+ <goal>integration-test</goal>
+ <goal>verify</goal>
</goals>
- <phase>integration-test</phase>
<configuration>
<includes>
- <include>**/*ExternalTest.java</include>
+ <include>**/*TabExternalTest.java</include>
</includes>
<excludes>
<exclude>**/DialectExternalTest.java</exclude>
</excludes>
<forkMode>always</forkMode>
+ <redirectTestOutputToFile>true</redirectTestOutputToFile>
</configuration>
</execution>
</executions>
@@ -281,19 +311,22 @@
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <version>2.5</version>
+ <artifactId>maven-failsafe-plugin</artifactId>
+ <version>2.10</version>
<executions>
<execution>
- <id>default-test</id>
+ <id>execDialectExternalTest</id>
<goals>
- <goal>test</goal>
+ <goal>integration-test</goal>
+ <goal>verify</goal>
</goals>
- <phase>integration-test</phase>
<configuration>
<includes>
<include>**/DialectExternalTest.java</include>
</includes>
+ <excludes>
+ <exclude>**/*TabExternalTest.java</exclude>
+ </excludes>
<systemPropertyVariables>
<jdbcUrl>${jdbcUrl}</jdbcUrl>
<jdbcUser>${jdbcUser}</jdbcUser>
@@ -302,6 +335,7 @@
<catalog>${catalog}</catalog>
<schema>${schema}</schema>
</systemPropertyVariables>
+ <redirectTestOutputToFile>true</redirectTestOutputToFile>
</configuration>
</execution>
</executions>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
Revision: 6548
http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=6548&view=rev
Author: manningr
Date: 2011-11-26 20:20:33 +0000 (Sat, 26 Nov 2011)
Log Message:
-----------
Fixed test to test the correct tab.
Modified Paths:
--------------
trunk/sql12/squirrelsql-integration-environment/src/test/java/net/sourceforge/squirrel_sql/plugins/mysql/tab/UserGrantsTabExternalTest.java
Modified: trunk/sql12/squirrelsql-integration-environment/src/test/java/net/sourceforge/squirrel_sql/plugins/mysql/tab/UserGrantsTabExternalTest.java
===================================================================
--- trunk/sql12/squirrelsql-integration-environment/src/test/java/net/sourceforge/squirrel_sql/plugins/mysql/tab/UserGrantsTabExternalTest.java 2011-11-26 20:19:32 UTC (rev 6547)
+++ trunk/sql12/squirrelsql-integration-environment/src/test/java/net/sourceforge/squirrel_sql/plugins/mysql/tab/UserGrantsTabExternalTest.java 2011-11-26 20:20:33 UTC (rev 6548)
@@ -30,7 +30,7 @@
}
protected BaseObjectTab getTabToTest() {
- return new TableStatusTab();
+ return new UserGrantsTab();
}
protected String getAlias() {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
Revision: 6547
http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=6547&view=rev
Author: manningr
Date: 2011-11-26 20:19:32 +0000 (Sat, 26 Nov 2011)
Log Message:
-----------
Fixed test to test the correct tab.
Modified Paths:
--------------
trunk/sql12/squirrelsql-integration-environment/src/test/java/net/sourceforge/squirrel_sql/plugins/mysql/tab/TableStatusTabExternalTest.java
Modified: trunk/sql12/squirrelsql-integration-environment/src/test/java/net/sourceforge/squirrel_sql/plugins/mysql/tab/TableStatusTabExternalTest.java
===================================================================
--- trunk/sql12/squirrelsql-integration-environment/src/test/java/net/sourceforge/squirrel_sql/plugins/mysql/tab/TableStatusTabExternalTest.java 2011-11-26 18:30:24 UTC (rev 6546)
+++ trunk/sql12/squirrelsql-integration-environment/src/test/java/net/sourceforge/squirrel_sql/plugins/mysql/tab/TableStatusTabExternalTest.java 2011-11-26 20:19:32 UTC (rev 6547)
@@ -30,7 +30,7 @@
}
protected BaseObjectTab getTabToTest() {
- return new UserGrantsTab();
+ return new TableStatusTab();
}
protected String getAlias() {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <man...@us...> - 2011-11-26 18:30:30
|
Revision: 6546
http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=6546&view=rev
Author: manningr
Date: 2011-11-26 18:30:24 +0000 (Sat, 26 Nov 2011)
Log Message:
-----------
Always fork tests to avoid running out of perm gen space.
Modified Paths:
--------------
trunk/sql12/squirrelsql-integration-environment/pom.xml
Modified: trunk/sql12/squirrelsql-integration-environment/pom.xml
===================================================================
--- trunk/sql12/squirrelsql-integration-environment/pom.xml 2011-11-26 16:19:06 UTC (rev 6545)
+++ trunk/sql12/squirrelsql-integration-environment/pom.xml 2011-11-26 18:30:24 UTC (rev 6546)
@@ -258,6 +258,7 @@
<excludes>
<exclude>**/DialectExternalTest.java</exclude>
</excludes>
+ <forkMode>always</forkMode>
</configuration>
</execution>
</executions>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <man...@us...> - 2011-11-26 16:19:12
|
Revision: 6545
http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=6545&view=rev
Author: manningr
Date: 2011-11-26 16:19:06 +0000 (Sat, 26 Nov 2011)
Log Message:
-----------
Run all external tests except for DialectExternalTest in the pluginExternalTests profile.
Modified Paths:
--------------
trunk/sql12/squirrelsql-integration-environment/pom.xml
Modified: trunk/sql12/squirrelsql-integration-environment/pom.xml
===================================================================
--- trunk/sql12/squirrelsql-integration-environment/pom.xml 2011-11-26 15:52:41 UTC (rev 6544)
+++ trunk/sql12/squirrelsql-integration-environment/pom.xml 2011-11-26 16:19:06 UTC (rev 6545)
@@ -252,6 +252,9 @@
</goals>
<phase>integration-test</phase>
<configuration>
+ <includes>
+ <include>**/*ExternalTest.java</include>
+ </includes>
<excludes>
<exclude>**/DialectExternalTest.java</exclude>
</excludes>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <man...@us...> - 2011-11-26 15:52:47
|
Revision: 6544
http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=6544&view=rev
Author: manningr
Date: 2011-11-26 15:52:41 +0000 (Sat, 26 Nov 2011)
Log Message:
-----------
New profile for running only the plugin external tests.
Modified Paths:
--------------
trunk/sql12/squirrelsql-integration-environment/pom.xml
Modified: trunk/sql12/squirrelsql-integration-environment/pom.xml
===================================================================
--- trunk/sql12/squirrelsql-integration-environment/pom.xml 2011-11-26 14:58:19 UTC (rev 6543)
+++ trunk/sql12/squirrelsql-integration-environment/pom.xml 2011-11-26 15:52:41 UTC (rev 6544)
@@ -75,24 +75,6 @@
<target>${javac-target-version}</target>
</configuration>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <executions>
- <execution>
- <id>default-test</id>
- <goals>
- <goal>test</goal>
- </goals>
- <phase>integration-test</phase>
- <configuration>
- <excludes>
- <exclude>**/DialectExternalTest.java</exclude>
- </excludes>
- </configuration>
- </execution>
- </executions>
- </plugin>
</plugins>
</build>
<dependencies>
@@ -250,6 +232,36 @@
</dependency>
</dependencies>
<profiles>
+ <profile>
+ <id>pluginExternalTests</id>
+ <activation>
+ <property>
+ <name>pluginExternalTests</name>
+ </property>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>default-test</id>
+ <goals>
+ <goal>test</goal>
+ </goals>
+ <phase>integration-test</phase>
+ <configuration>
+ <excludes>
+ <exclude>**/DialectExternalTest.java</exclude>
+ </excludes>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
<!--
This profile must be used in conjunction with one of the driver
profiles below
@@ -267,19 +279,28 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>2.5</version>
- <configuration>
- <includes>
- <include>**/DialectExternalTest.java</include>
- </includes>
- <systemPropertyVariables>
- <jdbcUrl>${jdbcUrl}</jdbcUrl>
- <jdbcUser>${jdbcUser}</jdbcUser>
- <jdbcPass>${jdbcPass}</jdbcPass>
- <jdbcDriver>${jdbcDriver}</jdbcDriver>
- <catalog>${catalog}</catalog>
- <schema>${schema}</schema>
- </systemPropertyVariables>
- </configuration>
+ <executions>
+ <execution>
+ <id>default-test</id>
+ <goals>
+ <goal>test</goal>
+ </goals>
+ <phase>integration-test</phase>
+ <configuration>
+ <includes>
+ <include>**/DialectExternalTest.java</include>
+ </includes>
+ <systemPropertyVariables>
+ <jdbcUrl>${jdbcUrl}</jdbcUrl>
+ <jdbcUser>${jdbcUser}</jdbcUser>
+ <jdbcPass>${jdbcPass}</jdbcPass>
+ <jdbcDriver>${jdbcDriver}</jdbcDriver>
+ <catalog>${catalog}</catalog>
+ <schema>${schema}</schema>
+ </systemPropertyVariables>
+ </configuration>
+ </execution>
+ </executions>
</plugin>
</plugins>
</build>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <man...@us...> - 2011-11-26 14:58:25
|
Revision: 6543
http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=6543&view=rev
Author: manningr
Date: 2011-11-26 14:58:19 +0000 (Sat, 26 Nov 2011)
Log Message:
-----------
Switched to released version of dbcopy-cli.
Modified Paths:
--------------
trunk/sql12/squirrelsql-integration-environment/pom.xml
Modified: trunk/sql12/squirrelsql-integration-environment/pom.xml
===================================================================
--- trunk/sql12/squirrelsql-integration-environment/pom.xml 2011-11-26 14:27:35 UTC (rev 6542)
+++ trunk/sql12/squirrelsql-integration-environment/pom.xml 2011-11-26 14:58:19 UTC (rev 6543)
@@ -56,7 +56,7 @@
</ciManagement>
<properties>
- <squirrel-sql-version>3.3.0</squirrel-sql-version>
+ <squirrel-sql-version>3.4.0-SNAPSHOT</squirrel-sql-version>
</properties>
<!-- This is blatant copy/paste from squirrelsql-launcher pom.xml -->
@@ -147,7 +147,7 @@
<dependency>
<groupId>net.sf.squirrel-sql.cli</groupId>
<artifactId>dbcopy-cli</artifactId>
- <version>1.0.2-SNAPSHOT</version>
+ <version>1.0.2</version>
<scope>test</scope>
</dependency>
<dependency>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <man...@us...> - 2011-11-26 14:27:41
|
Revision: 6542
http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=6542&view=rev
Author: manningr
Date: 2011-11-26 14:27:35 +0000 (Sat, 26 Nov 2011)
Log Message:
-----------
Update for release.
Modified Paths:
--------------
trunk/sql12/plugins/cache/pom.xml
Modified: trunk/sql12/plugins/cache/pom.xml
===================================================================
--- trunk/sql12/plugins/cache/pom.xml 2011-11-26 14:26:56 UTC (rev 6541)
+++ trunk/sql12/plugins/cache/pom.xml 2011-11-26 14:27:35 UTC (rev 6542)
@@ -4,7 +4,7 @@
<parent>
<groupId>net.sf.squirrel-sql.plugins</groupId>
<artifactId>squirrelsql-plugins-parent-pom</artifactId>
- <version>3.3.0-SNAPSHOT</version>
+ <version>3.3.0</version>
<relativePath>../squirrelsql-plugins-parent-pom/pom.xml</relativePath>
</parent>
<artifactId>cache</artifactId>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <man...@us...> - 2011-11-26 14:27:02
|
Revision: 6541
http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=6541&view=rev
Author: manningr
Date: 2011-11-26 14:26:56 +0000 (Sat, 26 Nov 2011)
Log Message:
-----------
Update for release.
Modified Paths:
--------------
trunk/sql12/plugins/squirrelsql-plugin-archetype/src/main/resources/archetype-resources/pom.xml
Modified: trunk/sql12/plugins/squirrelsql-plugin-archetype/src/main/resources/archetype-resources/pom.xml
===================================================================
--- trunk/sql12/plugins/squirrelsql-plugin-archetype/src/main/resources/archetype-resources/pom.xml 2011-11-26 14:26:20 UTC (rev 6540)
+++ trunk/sql12/plugins/squirrelsql-plugin-archetype/src/main/resources/archetype-resources/pom.xml 2011-11-26 14:26:56 UTC (rev 6541)
@@ -5,7 +5,7 @@
<parent>
<groupId>net.sf.squirrel-sql.plugins</groupId>
<artifactId>squirrelsql-plugins-parent-pom</artifactId>
- <version>3.3.0-SNAPSHOT</version>
+ <version>3.3.0</version>
</parent>
<groupId>${groupId}</groupId>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <man...@us...> - 2011-11-26 14:26:26
|
Revision: 6540
http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=6540&view=rev
Author: manningr
Date: 2011-11-26 14:26:20 +0000 (Sat, 26 Nov 2011)
Log Message:
-----------
Update for release.
Modified Paths:
--------------
trunk/sql12/squirrelsql-integration-environment/pom.xml
Modified: trunk/sql12/squirrelsql-integration-environment/pom.xml
===================================================================
--- trunk/sql12/squirrelsql-integration-environment/pom.xml 2011-11-26 14:22:53 UTC (rev 6539)
+++ trunk/sql12/squirrelsql-integration-environment/pom.xml 2011-11-26 14:26:20 UTC (rev 6540)
@@ -4,7 +4,7 @@
<parent>
<groupId>net.sf.squirrel-sql</groupId>
<artifactId>squirrel-root-pom</artifactId>
- <version>3.3.0-SNAPSHOT</version>
+ <version>3.3.0</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>squirrelsql-integration-environment</artifactId>
@@ -56,7 +56,7 @@
</ciManagement>
<properties>
- <squirrel-sql-version>3.3.0-SNAPSHOT</squirrel-sql-version>
+ <squirrel-sql-version>3.3.0</squirrel-sql-version>
</properties>
<!-- This is blatant copy/paste from squirrelsql-launcher pom.xml -->
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <man...@us...> - 2011-11-26 14:22:59
|
Revision: 6539
http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=6539&view=rev
Author: manningr
Date: 2011-11-26 14:22:53 +0000 (Sat, 26 Nov 2011)
Log Message:
-----------
Update for release.
Modified Paths:
--------------
trunk/sql12/installer/squirrelsql-source/pom.xml
Modified: trunk/sql12/installer/squirrelsql-source/pom.xml
===================================================================
--- trunk/sql12/installer/squirrelsql-source/pom.xml 2011-11-26 14:16:06 UTC (rev 6538)
+++ trunk/sql12/installer/squirrelsql-source/pom.xml 2011-11-26 14:22:53 UTC (rev 6539)
@@ -4,13 +4,13 @@
<parent>
<groupId>net.sf.squirrel-sql</groupId>
<artifactId>squirrel-root-pom</artifactId>
- <version>3.3.0-SNAPSHOT</version>
+ <version>3.4.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<artifactId>squirrelsql-source</artifactId>
<packaging>jar</packaging>
- <version>3.3.0-SNAPSHOT</version>
+ <version>3.4.0-SNAPSHOT</version>
<name>SQuirreL SQL Client Source Archive (Aggregate)</name>
<description>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <man...@us...> - 2011-11-26 14:16:12
|
Revision: 6538
http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=6538&view=rev
Author: manningr
Date: 2011-11-26 14:16:06 +0000 (Sat, 26 Nov 2011)
Log Message:
-----------
update for release
Modified Paths:
--------------
tags/squirrel-root-pom-3.3.0/installer/squirrelsql-source/pom.xml
Modified: tags/squirrel-root-pom-3.3.0/installer/squirrelsql-source/pom.xml
===================================================================
--- tags/squirrel-root-pom-3.3.0/installer/squirrelsql-source/pom.xml 2011-11-22 13:54:55 UTC (rev 6537)
+++ tags/squirrel-root-pom-3.3.0/installer/squirrelsql-source/pom.xml 2011-11-26 14:16:06 UTC (rev 6538)
@@ -4,13 +4,13 @@
<parent>
<groupId>net.sf.squirrel-sql</groupId>
<artifactId>squirrel-root-pom</artifactId>
- <version>3.3.0-SNAPSHOT</version>
+ <version>3.3.0</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<artifactId>squirrelsql-source</artifactId>
<packaging>jar</packaging>
- <version>3.3.0-SNAPSHOT</version>
+ <version>3.3.0</version>
<name>SQuirreL SQL Client Source Archive (Aggregate)</name>
<description>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
