You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by ak...@apache.org on 2004/11/13 18:00:32 UTC
svn commit: rev 57580 - in incubator/directory/eve/trunk/jndi-provider/src/java/org/apache/eve: . db/gui
Author: akarasulu
Date: Sat Nov 13 09:00:31 2004
New Revision: 57580
Added:
incubator/directory/eve/trunk/jndi-provider/src/java/org/apache/eve/db/gui/MainFrame.java
- copied, changed from rev 57577, incubator/directory/eve/trunk/jndi-provider/src/java/org/apache/eve/db/gui/BackendFrame.java
incubator/directory/eve/trunk/jndi-provider/src/java/org/apache/eve/db/gui/PartitionViewer.java
- copied, changed from rev 57577, incubator/directory/eve/trunk/jndi-provider/src/java/org/apache/eve/db/gui/BackendDatabaseViewer.java
incubator/directory/eve/trunk/jndi-provider/src/java/org/apache/eve/db/gui/eve.gif
- copied unchanged from rev 57577, incubator/directory/eve/trunk/jndi-provider/src/java/org/apache/eve/db/gui/ldapd.gif
Removed:
incubator/directory/eve/trunk/jndi-provider/src/java/org/apache/eve/db/gui/BackendDatabaseViewer.java
incubator/directory/eve/trunk/jndi-provider/src/java/org/apache/eve/db/gui/BackendFrame.java
incubator/directory/eve/trunk/jndi-provider/src/java/org/apache/eve/db/gui/FilterDialog2.java
incubator/directory/eve/trunk/jndi-provider/src/java/org/apache/eve/db/gui/ldapd.gif
Modified:
incubator/directory/eve/trunk/jndi-provider/src/java/org/apache/eve/AbstractContextPartition.java
incubator/directory/eve/trunk/jndi-provider/src/java/org/apache/eve/db/gui/AboutDialog.java
incubator/directory/eve/trunk/jndi-provider/src/java/org/apache/eve/db/gui/SearchResultDialog.java
Log:
Changes ...
o reconnected gif on about dialog now using class based resource access
o renamed all thing LDAPd to Eve
o renamed classes to reflect switch from using backend to partion terms
Modified: incubator/directory/eve/trunk/jndi-provider/src/java/org/apache/eve/AbstractContextPartition.java
==============================================================================
--- incubator/directory/eve/trunk/jndi-provider/src/java/org/apache/eve/AbstractContextPartition.java (original)
+++ incubator/directory/eve/trunk/jndi-provider/src/java/org/apache/eve/AbstractContextPartition.java Sat Nov 13 09:00:31 2004
@@ -38,6 +38,7 @@
import org.apache.eve.db.Database;
import org.apache.eve.db.SearchEngine;
import org.apache.eve.db.SearchResultEnumeration;
+import org.apache.eve.db.gui.PartitionViewer;
/**
@@ -380,5 +381,12 @@
public void close() throws NamingException
{
db.close();
+ }
+
+
+ public void inspect() throws Exception
+ {
+ PartitionViewer viewer = new PartitionViewer( db, engine );
+ viewer.execute();
}
}
Modified: incubator/directory/eve/trunk/jndi-provider/src/java/org/apache/eve/db/gui/AboutDialog.java
==============================================================================
--- incubator/directory/eve/trunk/jndi-provider/src/java/org/apache/eve/db/gui/AboutDialog.java (original)
+++ incubator/directory/eve/trunk/jndi-provider/src/java/org/apache/eve/db/gui/AboutDialog.java Sat Nov 13 09:00:31 2004
@@ -85,7 +85,7 @@
getContentPane().setLayout(formLayout);
contentPane.setLayout(contentPaneLayout);
contentPane.setBorder(javax.swing.BorderFactory.createTitledBorder(javax.swing.BorderFactory.createLineBorder(
- new java.awt.Color(153, 153, 153), 1), "Ldapd Project", javax.swing.border.TitledBorder.LEADING, javax.swing.border.TitledBorder.TOP,
+ new java.awt.Color(153, 153, 153), 1), "Directory Project: Eve", javax.swing.border.TitledBorder.LEADING, javax.swing.border.TitledBorder.TOP,
new java.awt.Font("SansSerif", 0, 14), new java.awt.Color(60, 60, 60)));
prodLabel.setText(product);
prodLabel.setAlignmentX(0.5f);
@@ -113,9 +113,10 @@
new java.awt.GridBagConstraints(java.awt.GridBagConstraints.RELATIVE, java.awt.GridBagConstraints.RELATIVE,
java.awt.GridBagConstraints.REMAINDER, 3, 0.0, 1.0, java.awt.GridBagConstraints.NORTHWEST, java.awt.GridBagConstraints.BOTH,
new java.awt.Insets(5, 5, 5, 0), 0, 0));
- image.setText("Ldapd");
- image.setIcon(
- new javax.swing.ImageIcon("C:/projects/ldapd-modjdbm/src/java/ldapd/server/backend/modjdbm/gui/org.apache.ldap.gif"));
+
+ image.setText("Eve");
+ image.setIcon( new ImageIcon( getClass().getResource( "eve.gif" ) ) );
+
image.setHorizontalAlignment(javax.swing.SwingConstants.TRAILING);
image.setMinimumSize(new java.awt.Dimension(98,44));
image.setMaximumSize(new java.awt.Dimension(98,44));
Copied: incubator/directory/eve/trunk/jndi-provider/src/java/org/apache/eve/db/gui/MainFrame.java (from rev 57577, incubator/directory/eve/trunk/jndi-provider/src/java/org/apache/eve/db/gui/BackendFrame.java)
==============================================================================
--- incubator/directory/eve/trunk/jndi-provider/src/java/org/apache/eve/db/gui/BackendFrame.java (original)
+++ incubator/directory/eve/trunk/jndi-provider/src/java/org/apache/eve/db/gui/MainFrame.java Sat Nov 13 09:00:31 2004
@@ -23,7 +23,6 @@
import java.io.FileNotFoundException;
import java.math.BigInteger;
-import java.text.ParseException;
import java.util.Stack;
import java.util.HashMap;
@@ -88,7 +87,7 @@
* @author <a href="mailto:directory-dev@incubator.apache.org">Apache Directory Project</a>
* @version $Rev$
*/
-public class BackendFrame extends JFrame
+public class MainFrame extends JFrame
{
// Swing Stuff
private JLabel statusBar = new JLabel( "Ready" );
@@ -120,8 +119,8 @@
/**
* Creates new form JFrame
*/
- public BackendFrame( Database db, SearchEngine eng )
- throws Exception
+ public MainFrame( Database db, SearchEngine eng )
+ throws NamingException
{
database = db;
this.eng = eng;
@@ -225,8 +224,8 @@
public void actionPerformed( ActionEvent e )
{
AboutDialog aboutDialog =
- new AboutDialog ( BackendFrame.this, true );
- BackendFrame.this.centerOnScreen( aboutDialog );
+ new AboutDialog ( MainFrame.this, true );
+ MainFrame.this.centerOnScreen( aboutDialog );
aboutDialog.setVisible( true );
}
} );
@@ -460,12 +459,6 @@
}
}
}
- catch( ParseException e )
- {
- // @todo display popup with error here!
- e.printStackTrace();
- return;
- }
catch( NamingException e )
{
// @todo display popup with error here!
@@ -773,7 +766,7 @@
}
AnnotatedFilterTreeDialog treeDialog = new
- AnnotatedFilterTreeDialog( BackendFrame.this, false );
+ AnnotatedFilterTreeDialog( MainFrame.this, false );
treeDialog.setFilter( filter );
eng.getOptimizer().annotate( root );
@@ -878,7 +871,7 @@
}
- private void load() throws Exception
+ private void load() throws NamingException
{
// boolean doFiltered = false;
nodes = new HashMap();
Copied: incubator/directory/eve/trunk/jndi-provider/src/java/org/apache/eve/db/gui/PartitionViewer.java (from rev 57577, incubator/directory/eve/trunk/jndi-provider/src/java/org/apache/eve/db/gui/BackendDatabaseViewer.java)
==============================================================================
--- incubator/directory/eve/trunk/jndi-provider/src/java/org/apache/eve/db/gui/BackendDatabaseViewer.java (original)
+++ incubator/directory/eve/trunk/jndi-provider/src/java/org/apache/eve/db/gui/PartitionViewer.java Sat Nov 13 09:00:31 2004
@@ -20,6 +20,8 @@
import java.awt.Toolkit ;
import java.awt.Dimension ;
+import javax.naming.NamingException;
+
import org.apache.eve.db.SearchEngine;
import org.apache.eve.db.Database;
@@ -30,14 +32,14 @@
* @author <a href="mailto:directory-dev@incubator.apache.org">Apache Directory Project</a>
* @version $Rev$
*/
-public class BackendDatabaseViewer
+public class PartitionViewer
{
/** A handle on the atomic partition */
private Database db;
private SearchEngine eng;
- public BackendDatabaseViewer( Database db, SearchEngine eng )
+ public PartitionViewer( Database db, SearchEngine eng )
{
this.db = db;
this.eng = eng;
@@ -63,7 +65,7 @@
// e.printStackTrace() ;
// }
//
-// BackendDatabaseViewer viewer = new BackendDatabaseViewer( ) ;
+// PartitionViewer viewer = new PartitionViewer( ) ;
//
// try
// {
@@ -77,9 +79,9 @@
// }
- public void execute() throws Exception
+ public void execute() throws NamingException
{
- BackendFrame frame = new BackendFrame( db, eng ) ;
+ MainFrame frame = new MainFrame( db, eng ) ;
Dimension screenSize = Toolkit.getDefaultToolkit().getScreenSize() ;
Dimension frameSize = frame.getSize() ;
Modified: incubator/directory/eve/trunk/jndi-provider/src/java/org/apache/eve/db/gui/SearchResultDialog.java
==============================================================================
--- incubator/directory/eve/trunk/jndi-provider/src/java/org/apache/eve/db/gui/SearchResultDialog.java (original)
+++ incubator/directory/eve/trunk/jndi-provider/src/java/org/apache/eve/db/gui/SearchResultDialog.java Sat Nov 13 09:00:31 2004
@@ -139,7 +139,7 @@
if(selectionModel.isSelectedIndex(ii) && !an_event.getValueIsAdjusting()) {
BigInteger id = (BigInteger)
m_resultsTbl.getModel().getValueAt(ii, 0) ;
- ((BackendFrame) getParent()).selectTreeNode(id) ;
+ ((MainFrame) getParent()).selectTreeNode(id) ;
}
}
}