From 639007759c00110c2ef70f6ba394dc3f9ac69020 Mon Sep 17 00:00:00 2001 From: Walter Korman Date: Fri, 2 Nov 2001 15:39:07 +0000 Subject: [PATCH] Changed builder model to make data available on the character classes and components unmodifiable. git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@590 542714f4-19e9-0310-aa3c-eee0fc999fb1 --- .../com/threerings/cast/builder/BuilderModel.java | 12 ++++++------ .../com/threerings/cast/builder/ComponentPanel.java | 8 ++++---- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/java/com/threerings/cast/builder/BuilderModel.java b/src/java/com/threerings/cast/builder/BuilderModel.java index c12b4a6db..e86cb2b75 100644 --- a/src/java/com/threerings/cast/builder/BuilderModel.java +++ b/src/java/com/threerings/cast/builder/BuilderModel.java @@ -1,5 +1,5 @@ // -// $Id: BuilderModel.java,v 1.1 2001/11/02 01:10:28 shaper Exp $ +// $Id: BuilderModel.java,v 1.2 2001/11/02 15:39:07 shaper Exp $ package com.threerings.cast.builder; @@ -54,16 +54,16 @@ public class BuilderModel */ public List getComponentClasses () { - return _classes; + return Collections.unmodifiableList(_classes); } /** - * Returns a hashtable of the components available for each - * component class, keyed on component class id. + * Returns a map of the components available for each component + * class, keyed on component class id. */ - public HashIntMap getComponents () + public Map getComponents () { - return _components; + return Collections.unmodifiableMap(_components); } /** diff --git a/src/java/com/threerings/cast/builder/ComponentPanel.java b/src/java/com/threerings/cast/builder/ComponentPanel.java index e2283d67d..7a571fe3d 100644 --- a/src/java/com/threerings/cast/builder/ComponentPanel.java +++ b/src/java/com/threerings/cast/builder/ComponentPanel.java @@ -1,15 +1,15 @@ // -// $Id: ComponentPanel.java,v 1.3 2001/11/02 01:10:28 shaper Exp $ +// $Id: ComponentPanel.java,v 1.4 2001/11/02 15:39:07 shaper Exp $ package com.threerings.cast.builder; import java.util.List; +import java.util.Map; import javax.swing.*; import javax.swing.border.Border; import com.samskivert.swing.*; -import com.samskivert.util.HashIntMap; import com.threerings.cast.Log; import com.threerings.cast.*; @@ -40,12 +40,12 @@ public class ComponentPanel extends JPanel protected void addClassEditors (BuilderModel model) { List classes = model.getComponentClasses(); - HashIntMap components = model.getComponents(); + Map components = model.getComponents(); int size = classes.size(); for (int ii = 0; ii < size; ii++) { ComponentClass cclass = (ComponentClass)classes.get(ii); - List ccomps = (List)components.get(cclass.clid); + List ccomps = (List)components.get(new Integer(cclass.clid)); add(new ClassEditor(model, cclass, ccomps)); } }