Fix typos in README.md and add queries to aktie.index.Index

README.md

@@ -1,4 +1,4 @@
-Atkie
+Aktie
 =====
 
-**Atkie** is an anonymous file sharing and distributed forums system.
+**Aktie** is an anonymous file sharing and distributed forums system.

src/aktie/gui/AddFieldDialog.java

@@ -193,7 +193,7 @@ public AddFieldTable ( Composite composite, AddFieldInterface fv )
             column.setMoveable ( false );
             column.setSortable ( false );
 
-            column = addColumn ( "Creator", 100, new CObjListTableCellLabelProviderTypeIdentityName ( CObj.CREATOR, true, null, fieldAdder.getIdCache() ) );
+            column = addColumn ( "Creator", 100, new CObjListTableCellLabelProviderTypeIdentityName ( CObj.CREATOR, true, null, fieldAdder.getIndex() ) );
             column.setMoveable ( false );
         }
 

src/aktie/gui/AddFieldInterface.java

@@ -12,8 +12,6 @@ public interface AddFieldInterface
 
     public CObj getCommunity();
 
-    public IdentityCache getIdCache();
-
     public TableViewer getTableViewer();
 
 }

src/aktie/gui/AdvancedSearchDialog.java

@@ -1080,12 +1080,6 @@ public CObj getCommunity()
         return community;
     }
 
-    @Override
-    public IdentityCache getIdCache()
-    {
-        return app.getIdCache();
-    }
-
     @Override
     public TableViewer getTableViewer()
     {

src/aktie/gui/ConnectionDialog.java

@@ -122,14 +122,14 @@ private void setFromTo ( String fromid, String toid )
         if ( fromId != null && toId != null && lblFrom != null && !lblFrom.isDisposed() &&
                 lblTo != null && !lblTo.isDisposed() )
         {
-            String ln = app.getIdCache().getName ( fromId );
+            String ln = app.getNode().getIndex().getDisplayNameForIdentity ( fromId );
 
             if ( ln != null )
             {
                 lblFrom.setText ( ln );
             }
 
-            String rm = app.getIdCache().getName ( toId );
+            String rm = app.getNode().getIndex().getDisplayNameForIdentity ( toId );
 
             if ( rm != null )
             {

src/aktie/gui/NewPostDialog.java

@@ -1003,12 +1003,6 @@ public Index getIndex()
         return app.getNode().getIndex();
     }
 
-    @Override
-    public IdentityCache getIdCache()
-    {
-        return app.getIdCache();
-    }
-
     @Override
     public TableViewer getTableViewer()
     {

src/aktie/gui/PostsTable.java

@@ -275,7 +275,7 @@ private String getPostString ( CObj pst )
                         dsc.replace ( "\r", "" );
                         String fldline = String.format ( "%15s:%-20s | %20s | %s",
                                                          nm, vs,
-                                                         app.getIdCache().getName ( pst.getString ( CObj.CREATOR ) ),
+                                                         app.getNode().getIndex().getDisplayNameForIdentity ( pst.getString ( CObj.CREATOR ) ),
                                                          dsc );
                         fldline = fldline.substring ( 0, Math.min ( fldline.length(), 79 ) );
                         msg.append ( fldline );

src/aktie/gui/SWTApp.java

@@ -1374,12 +1374,6 @@ private Properties getI2PReady()
         return i2pDialog.getI2PProps();
     }
 
-    private IdentityCache idCache;
-    public IdentityCache getIdCache()
-    {
-        return idCache;
-    }
-
     private void startNodeThread ( final Properties p )
     {
         Thread t = new Thread ( new Runnable()
@@ -1408,8 +1402,6 @@ public void run()
 
                     updateAfterNodeStart();
 
-                    idCache = new IdentityCache ( node.getIndex() );
-
                     node.getShareManager().setShareListener ( new ShareListener()
                     {
 

src/aktie/gui/pm/PMTable.java

@@ -102,10 +102,10 @@ public void selectionChanged ( SelectionChangedEvent s )
                             {
                                 StringBuilder sb = new StringBuilder();
                                 sb.append ( "FROM: " );
-                                sb.append ( PMTable.this.tab.getSWTApp().getIdCache().getName ( pfrom ) );
+                                sb.append ( PMTable.this.tab.getSWTApp().getNode().getIndex().getDisplayNameForIdentity ( pfrom ) );
                                 sb.append ( "\n" );
                                 sb.append ( "TO:   " );
-                                sb.append ( PMTable.this.tab.getSWTApp().getIdCache().getName ( pto ) );
+                                sb.append ( PMTable.this.tab.getSWTApp().getNode().getIndex().getDisplayNameForIdentity ( pto ) );
                                 sb.append ( "\n" );
                                 sb.append ( "DATE: " );
                                 Long co = currentMessage.getPrivateNumber ( CObj.CREATEDON );

src/aktie/gui/pm/PrivateMessageDialog.java

@@ -104,8 +104,8 @@ public void updateToFrom ( String from, String to, CObj replytomsg )
                     lblMsgTo != null && !lblMsgTo.isDisposed() &&
                     SubjectText != null && !SubjectText.isDisposed() )
             {
-                lblFrm.setText ( app.getIdCache().getName ( fromIdent ) );
-                lblMsgTo.setText ( app.getIdCache().getName ( toIdent ) );
+                lblFrm.setText ( app.getNode().getIndex().getDisplayNameForIdentity ( fromIdent ) );
+                lblMsgTo.setText ( app.getNode().getIndex().getDisplayNameForIdentity ( toIdent ) );
 
                 if ( replyToMessage != null )
                 {

src/aktie/gui/subtree/SubTreeModel.java

@@ -17,7 +17,6 @@
 import org.eclipse.jface.viewers.ViewerDropAdapter;
 
 import aktie.data.CObj;
-import aktie.gui.IdentityCache;
 import aktie.index.CObjList;
 import aktie.index.Index;
 
@@ -35,7 +34,6 @@ public class SubTreeModel implements ITreeContentProvider
     private Map<String, SubTreeEntity> idMap;
     private SubTreeEntityDBInterface db;
     private Index index;
-    private IdentityCache cache;
     private int type;
     private int treeId;
 
@@ -52,7 +50,6 @@ public SubTreeModel ( Index idx, SubTreeEntityDBInterface d, int t, int tid )
         parents = new HashMap<Long, Long>();
         fullObj = new HashMap<Long, CObj>();
         idMap = new HashMap<String, SubTreeEntity>();
-        cache = new IdentityCache ( idx );
     }
 
     private synchronized void removeFromChildren ( SubTreeEntity se )
@@ -378,7 +375,7 @@ public synchronized void update ( CObj c )
 
                     if ( privname == null )
                     {
-                        privname = cache.getName ( rid );
+                        privname = index.getDisplayNameForIdentity ( rid );
 
                         if ( privname != null )
                         {
@@ -404,7 +401,7 @@ public synchronized void update ( CObj c )
 
                                         if ( mcreator != null )
                                         {
-                                            String cname = cache.getName ( mcreator );
+                                            String cname = index.getDisplayNameForIdentity ( mcreator );
                                             msg.pushPrivate ( CObj.NAME, cname );
                                             index.index ( msg );
                                         }

src/aktie/gui/table/CObjListTableCellLabelProviderTypeIdentityName.java

@@ -4,18 +4,18 @@
 
 import aktie.data.CObj;
 import aktie.gui.CObjListGetter;
-import aktie.gui.IdentityCache;
+import aktie.index.Index;
 
 public class CObjListTableCellLabelProviderTypeIdentityName extends CObjListTableCellLabelProvider
 {
 
-    private IdentityCache identityCache;
+    private Index index;
 
-    public CObjListTableCellLabelProviderTypeIdentityName ( String key, boolean privateAttribute, String highlightKey, IdentityCache idCache )
+    public CObjListTableCellLabelProviderTypeIdentityName ( String key, boolean privateAttribute, String highlightKey, Index index )
     {
         super ( key, privateAttribute, SortField.Type.STRING, highlightKey );
 
-        identityCache = idCache;
+        this.index = index;
     }
 
     @Override
@@ -32,7 +32,7 @@ public String getFormattedAttribute ( CObj co )
 
             else
             {
-                id = identityCache.getName ( id );
+                id = index.getDisplayNameForIdentity ( id );
             }
 
             return id;