From 2a598b49afaf581311c9b91d109d274409a81299 Mon Sep 17 00:00:00 2001 From: Michael Bayne Date: Sun, 29 Jun 2008 12:37:32 +0000 Subject: [PATCH] Nix unused imports, regen services. git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@5203 542714f4-19e9-0310-aa3c-eee0fc999fb1 --- .../com/threerings/admin/client/ConfigObjectManager.java | 3 --- src/java/com/threerings/admin/client/DSetEditor.java | 7 ------- src/java/com/threerings/admin/client/FieldEditor.java | 2 -- .../com/threerings/admin/client/ObjectEditorPanel.java | 1 - src/java/com/threerings/admin/data/AdminMarshaller.java | 1 - src/java/com/threerings/admin/server/AdminDispatcher.java | 5 ++--- .../threerings/admin/server/DatabaseConfigRegistry.java | 1 - .../admin/server/PeeredDatabaseConfigRegistry.java | 1 - .../com/threerings/admin/server/persist/ConfigRecord.java | 1 - 9 files changed, 2 insertions(+), 20 deletions(-) diff --git a/src/java/com/threerings/admin/client/ConfigObjectManager.java b/src/java/com/threerings/admin/client/ConfigObjectManager.java index b7ec589a2..f0ab0cf9e 100644 --- a/src/java/com/threerings/admin/client/ConfigObjectManager.java +++ b/src/java/com/threerings/admin/client/ConfigObjectManager.java @@ -23,11 +23,8 @@ package com.threerings.admin.client; import java.util.HashMap; -import com.samskivert.util.StringUtil; - import com.threerings.presents.client.Client; import com.threerings.presents.client.ClientAdapter; -import com.threerings.presents.dobj.DObject; import com.threerings.presents.dobj.DObjectManager; import com.threerings.presents.dobj.ObjectAccessException; import com.threerings.presents.dobj.Subscriber; diff --git a/src/java/com/threerings/admin/client/DSetEditor.java b/src/java/com/threerings/admin/client/DSetEditor.java index 719aa35c2..25fbc9304 100644 --- a/src/java/com/threerings/admin/client/DSetEditor.java +++ b/src/java/com/threerings/admin/client/DSetEditor.java @@ -25,20 +25,15 @@ import java.awt.BorderLayout; import java.awt.Dimension; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; -import java.lang.reflect.Field; -import java.util.BitSet; import javax.swing.JPanel; import javax.swing.JScrollPane; import javax.swing.JTable; -import javax.swing.table.AbstractTableModel; import com.samskivert.swing.ObjectEditorTable; import com.samskivert.swing.event.CommandEvent; -import com.samskivert.util.ClassUtil; import com.samskivert.util.ComparableArrayList; -import com.samskivert.util.ListUtil; import com.threerings.presents.dobj.AttributeChangeListener; import com.threerings.presents.dobj.AttributeChangedEvent; @@ -49,8 +44,6 @@ import com.threerings.presents.dobj.EntryRemovedEvent; import com.threerings.presents.dobj.EntryUpdatedEvent; import com.threerings.presents.dobj.SetListener; -import static com.threerings.presents.Log.log; - /** * Allows simple editing of DSets within a distributed object. */ diff --git a/src/java/com/threerings/admin/client/FieldEditor.java b/src/java/com/threerings/admin/client/FieldEditor.java index 1745686e6..79fca1a8b 100644 --- a/src/java/com/threerings/admin/client/FieldEditor.java +++ b/src/java/com/threerings/admin/client/FieldEditor.java @@ -31,11 +31,9 @@ import java.lang.reflect.Field; import javax.swing.BorderFactory; import javax.swing.JLabel; import javax.swing.JPanel; -import javax.swing.JTextField; import com.samskivert.swing.HGroupLayout; import com.samskivert.util.ObjectUtil; -import com.samskivert.util.StringUtil; import com.threerings.presents.dobj.AttributeChangeListener; import com.threerings.presents.dobj.AttributeChangedEvent; diff --git a/src/java/com/threerings/admin/client/ObjectEditorPanel.java b/src/java/com/threerings/admin/client/ObjectEditorPanel.java index 419d1b56a..68382e981 100644 --- a/src/java/com/threerings/admin/client/ObjectEditorPanel.java +++ b/src/java/com/threerings/admin/client/ObjectEditorPanel.java @@ -25,7 +25,6 @@ import java.lang.reflect.Field; import java.lang.reflect.Modifier; import javax.swing.BorderFactory; -import javax.swing.JPanel; import com.samskivert.swing.ScrollablePanel; import com.samskivert.swing.VGroupLayout; diff --git a/src/java/com/threerings/admin/data/AdminMarshaller.java b/src/java/com/threerings/admin/data/AdminMarshaller.java index 68aa7a4c4..d1f46df49 100644 --- a/src/java/com/threerings/admin/data/AdminMarshaller.java +++ b/src/java/com/threerings/admin/data/AdminMarshaller.java @@ -25,7 +25,6 @@ import com.threerings.admin.client.AdminService; import com.threerings.presents.client.Client; import com.threerings.presents.data.InvocationMarshaller; import com.threerings.presents.dobj.InvocationResponseEvent; -import com.threerings.presents.net.Transport; /** * Provides the implementation of the {@link AdminService} interface diff --git a/src/java/com/threerings/admin/server/AdminDispatcher.java b/src/java/com/threerings/admin/server/AdminDispatcher.java index 83059fac3..a1bb844a2 100644 --- a/src/java/com/threerings/admin/server/AdminDispatcher.java +++ b/src/java/com/threerings/admin/server/AdminDispatcher.java @@ -24,14 +24,13 @@ package com.threerings.admin.server; import com.threerings.admin.client.AdminService; import com.threerings.admin.data.AdminMarshaller; import com.threerings.presents.data.ClientObject; -import com.threerings.presents.data.InvocationMarshaller; import com.threerings.presents.server.InvocationDispatcher; import com.threerings.presents.server.InvocationException; /** * Dispatches requests to the {@link AdminProvider}. */ -public class AdminDispatcher extends InvocationDispatcher +public class AdminDispatcher extends InvocationDispatcher { /** * Creates a dispatcher that may be registered to dispatch invocation @@ -43,7 +42,7 @@ public class AdminDispatcher extends InvocationDispatcher } @Override // documentation inherited - public InvocationMarshaller createMarshaller () + public AdminMarshaller createMarshaller () { return new AdminMarshaller(); } diff --git a/src/java/com/threerings/admin/server/DatabaseConfigRegistry.java b/src/java/com/threerings/admin/server/DatabaseConfigRegistry.java index 2f457437a..4970b2ed3 100644 --- a/src/java/com/threerings/admin/server/DatabaseConfigRegistry.java +++ b/src/java/com/threerings/admin/server/DatabaseConfigRegistry.java @@ -89,7 +89,6 @@ public class DatabaseConfigRegistry extends ConfigRegistry this(ctx, invoker, node, false); } - /** * Creates a configuration registry and prepares it for operation. * diff --git a/src/java/com/threerings/admin/server/PeeredDatabaseConfigRegistry.java b/src/java/com/threerings/admin/server/PeeredDatabaseConfigRegistry.java index 20b3761c1..1103bf3a5 100644 --- a/src/java/com/threerings/admin/server/PeeredDatabaseConfigRegistry.java +++ b/src/java/com/threerings/admin/server/PeeredDatabaseConfigRegistry.java @@ -29,7 +29,6 @@ import com.samskivert.io.PersistenceException; import com.samskivert.jdbc.depot.PersistenceContext; import com.samskivert.util.Invoker; -import com.threerings.io.SimpleStreamableObject; import com.threerings.io.Streamable; import com.threerings.util.StreamableTuple; diff --git a/src/java/com/threerings/admin/server/persist/ConfigRecord.java b/src/java/com/threerings/admin/server/persist/ConfigRecord.java index eef057898..5d98a9c1e 100644 --- a/src/java/com/threerings/admin/server/persist/ConfigRecord.java +++ b/src/java/com/threerings/admin/server/persist/ConfigRecord.java @@ -78,7 +78,6 @@ public class ConfigRecord extends PersistentRecord @Column(name="VALUE", type="TEXT") public String value; - /** * An empty constructor for unmarshalling. */