Menu
▾
▴
[Gridarta-commit] SF.net SVN: gridarta:[7853] trunk/src/app/net/sf/gridarta
|
From: <aki...@us...> - 2010-05-22 13:48:21
|
Revision: 7853
http://gridarta.svn.sourceforge.net/gridarta/?rev=7853&view=rev
Author: akirschbaum
Date: 2010-05-22 13:48:14 +0000 (Sat, 22 May 2010)
Log Message:
-----------
Remove direct accesses to the copy buffer's internal map model.
Modified Paths:
--------------
trunk/src/app/net/sf/gridarta/gui/copybuffer/CopyBuffer.java
trunk/src/app/net/sf/gridarta/gui/replacedialog/ReplaceDialog.java
trunk/src/app/net/sf/gridarta/gui/replacedialog/ReplaceDialogManager.java
trunk/src/app/net/sf/gridarta/maincontrol/GUIMainControl.java
Modified: trunk/src/app/net/sf/gridarta/gui/copybuffer/CopyBuffer.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/copybuffer/CopyBuffer.java 2010-05-22 13:43:41 UTC (rev 7852)
+++ trunk/src/app/net/sf/gridarta/gui/copybuffer/CopyBuffer.java 2010-05-22 13:48:14 UTC (rev 7853)
@@ -23,6 +23,7 @@
import java.awt.Rectangle;
import java.util.Collection;
import java.util.HashSet;
+import java.util.List;
import net.sf.gridarta.gui.map.mapview.MapView;
import net.sf.gridarta.model.archetype.Archetype;
import net.sf.gridarta.model.baseobject.BaseObject;
@@ -237,4 +238,14 @@
return true;
}
+ /**
+ * Return all game objects. Only top-level head parts are returned; tail
+ * parts are ignored as are objects in inventories.
+ * @return all game objects
+ */
+ @NotNull
+ public List<G> getAllGameObjects() {
+ return mapModel.getAllGameObjects();
+ }
+
} // class CopyBuffer
Modified: trunk/src/app/net/sf/gridarta/gui/replacedialog/ReplaceDialog.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/replacedialog/ReplaceDialog.java 2010-05-22 13:43:41 UTC (rev 7852)
+++ trunk/src/app/net/sf/gridarta/gui/replacedialog/ReplaceDialog.java 2010-05-22 13:48:14 UTC (rev 7853)
@@ -43,6 +43,7 @@
import javax.swing.JTextField;
import javax.swing.WindowConstants;
import javax.swing.text.JTextComponent;
+import net.sf.gridarta.gui.copybuffer.CopyBuffer;
import net.sf.gridarta.gui.map.mapview.MapView;
import net.sf.gridarta.gui.objectchooser.ObjectChooser;
import net.sf.gridarta.gui.objectchooser.ObjectChooserListener;
@@ -129,10 +130,10 @@
private final Component parent;
/**
- * The copy buffer's {@link MapModel}.
+ * The {@link CopyBuffer}.
*/
@NotNull
- private final MapModel<G, A, R> copyBufferMapModel;
+ private final CopyBuffer<G, A, R> copyBuffer;
/**
* The object chooser to use.
@@ -224,19 +225,19 @@
/**
* Creates a new instance.
* @param parent the parent component for dialogs
- * @param copyBufferMapModel the copy buffer's map model
+ * @param copyBuffer the copy buffer's
* @param objectChooser the object chooser to use
* @param faceObjectProviders the face object providers for looking up
* faces
* @param insertionModeSet the insertion mode set to use
*/
- public ReplaceDialog(@NotNull final Component parent, @NotNull final MapModel<G, A, R> copyBufferMapModel, @NotNull final ObjectChooser<G, A, R> objectChooser, @NotNull final FaceObjectProviders faceObjectProviders, @NotNull final InsertionModeSet<G, A, R> insertionModeSet) {
+ public ReplaceDialog(@NotNull final Component parent, @NotNull final CopyBuffer<G, A, R> copyBuffer, @NotNull final ObjectChooser<G, A, R> objectChooser, @NotNull final FaceObjectProviders faceObjectProviders, @NotNull final InsertionModeSet<G, A, R> insertionModeSet) {
this.insertionModeSet = insertionModeSet;
dialog = createDialog(parent, ACTION_BUILDER.getString("replaceTitle"));
dialog.setModal(false);
dialog.setDefaultCloseOperation(WindowConstants.HIDE_ON_CLOSE);
this.parent = parent;
- this.copyBufferMapModel = copyBufferMapModel;
+ this.copyBuffer = copyBuffer;
this.objectChooser = objectChooser;
this.faceObjectProviders = faceObjectProviders;
objectChooser.addObjectChooserListener(objectChooserListener);
@@ -249,7 +250,7 @@
public void display(@NotNull final MapView<G, A, R> mapView) {
replaceArch = objectChooser.getCursorSelection(); // highlighted arch
replacePickmap = objectChooser.getSelections(); // selected arches
- replaceCopyBuffer = copyBufferMapModel.getAllGameObjects();
+ replaceCopyBuffer = copyBuffer.getAllGameObjects();
if (isBuilt) {
// just set fields and show
@@ -540,7 +541,7 @@
break;
case REPLACE_WITH_COPY_BUFFER:
- replaceCopyBuffer = copyBufferMapModel.getAllGameObjects();
+ replaceCopyBuffer = copyBuffer.getAllGameObjects();
iconLabel.setIcon(null);
size = replaceCopyBuffer.size();
rfArchName.setText(String.valueOf(size));
Modified: trunk/src/app/net/sf/gridarta/gui/replacedialog/ReplaceDialogManager.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/replacedialog/ReplaceDialogManager.java 2010-05-22 13:43:41 UTC (rev 7852)
+++ trunk/src/app/net/sf/gridarta/gui/replacedialog/ReplaceDialogManager.java 2010-05-22 13:48:14 UTC (rev 7853)
@@ -20,6 +20,7 @@
package net.sf.gridarta.gui.replacedialog;
import java.awt.Component;
+import net.sf.gridarta.gui.copybuffer.CopyBuffer;
import net.sf.gridarta.gui.map.mapview.MapView;
import net.sf.gridarta.gui.map.mapview.MapViewManager;
import net.sf.gridarta.gui.map.mapview.MapViewManagerListener;
@@ -29,7 +30,6 @@
import net.sf.gridarta.model.gameobject.GameObject;
import net.sf.gridarta.model.map.maparchobject.MapArchObject;
import net.sf.gridarta.model.map.mapmodel.InsertionModeSet;
-import net.sf.gridarta.model.map.mapmodel.MapModel;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
@@ -48,10 +48,10 @@
private final Component parent;
/**
- * The copy buffer's {@link MapModel}.
+ * The {@link CopyBuffer}.
*/
@NotNull
- private final MapModel<G, A, R> copyBufferMapModel;
+ private final CopyBuffer<G, A, R> copyBuffer;
@NotNull
private final ObjectChooser<G, A, R> objectChooser;
@@ -95,14 +95,14 @@
/**
* Creates a new instance.
- * @param copyBufferMapModel the copy buffer's map model
+ * @param copyBuffer the copy buffer's
* @param faceObjectProviders the face object providers for looking up
* faces
* @param insertionModeSet the insertion mode set to use
*/
- public ReplaceDialogManager(@NotNull final Component parent, @NotNull final MapModel<G, A, R> copyBufferMapModel, @NotNull final ObjectChooser<G, A, R> objectChooser, @NotNull final MapViewManager<G, A, R> mapViewManager, @NotNull final FaceObjectProviders faceObjectProviders, @NotNull final InsertionModeSet<G, A, R> insertionModeSet) {
+ public ReplaceDialogManager(@NotNull final Component parent, @NotNull final CopyBuffer<G, A, R> copyBuffer, @NotNull final ObjectChooser<G, A, R> objectChooser, @NotNull final MapViewManager<G, A, R> mapViewManager, @NotNull final FaceObjectProviders faceObjectProviders, @NotNull final InsertionModeSet<G, A, R> insertionModeSet) {
this.parent = parent;
- this.copyBufferMapModel = copyBufferMapModel;
+ this.copyBuffer = copyBuffer;
this.objectChooser = objectChooser;
this.faceObjectProviders = faceObjectProviders;
this.insertionModeSet = insertionModeSet;
@@ -121,7 +121,7 @@
@NotNull
public ReplaceDialog<G, A, R> getInstance() {
if (instance == null) {
- instance = new ReplaceDialog<G, A, R>(parent, copyBufferMapModel, objectChooser, faceObjectProviders, insertionModeSet);
+ instance = new ReplaceDialog<G, A, R>(parent, copyBuffer, objectChooser, faceObjectProviders, insertionModeSet);
}
return instance;
}
Modified: trunk/src/app/net/sf/gridarta/maincontrol/GUIMainControl.java
===================================================================
--- trunk/src/app/net/sf/gridarta/maincontrol/GUIMainControl.java 2010-05-22 13:43:41 UTC (rev 7852)
+++ trunk/src/app/net/sf/gridarta/maincontrol/GUIMainControl.java 2010-05-22 13:48:14 UTC (rev 7853)
@@ -426,7 +426,7 @@
final MapModel<G, A, R> copyBufferMapModel = mapControlFactory.newMapModel(mapArchObject);
final InsertionModeSet<G, A, R> insertionModeSet = new InsertionModeSet<G, A, R>(topmostInsertionMode);
final CopyBuffer<G, A, R> copyBuffer = new CopyBuffer<G, A, R>(mapViewSettings, copyBufferMapModel, gameObjectFactory, insertionModeSet);
- final ReplaceDialogManager<G, A, R> replaceDialogManager = new ReplaceDialogManager<G, A, R>(mainViewFrame, copyBufferMapModel, objectChooser, mapViewManager, faceObjectProviders, insertionModeSet);
+ final ReplaceDialogManager<G, A, R> replaceDialogManager = new ReplaceDialogManager<G, A, R>(mainViewFrame, copyBuffer, objectChooser, mapViewManager, faceObjectProviders, insertionModeSet);
new About(mainViewFrame);
exiter = new DefaultExiter(mainViewFrame);
scriptEditControl = new ScriptEditControl(scriptFileFilter, scriptExtension, mainViewFrame, globalSettings.getMapsDirectory(), prefs, exiter);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
