Skip to content

Set new parts on the default parts layer #23

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
LFriede wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Set new parts on the default parts layer #23

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions MANIFEST.MF
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Manifest-Version: 1.0
Ant-Version: Apache Ant 1.8.2
Created-By: 1.6.0_26-b03 (Sun Microsystems Inc.)
Built-By: pueskma
Ant-Version: Apache Ant 1.9.6
Created-By: 1.8.0_144-b01 (Oracle Corporation)
Built-By: gordon
Main-Class: org.pmedv.blackboard.app.BlackBoard
Class-Path: lib/commons-beanutils-1.8.3.jar lib/beansbinding-1.2.
1.jar lib/commons-collections-3.2.jar lib/commons-io-1.3.1.ja
Expand Down
6 changes: 3 additions & 3 deletions build.number
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
#Build Number for ANT. Do not edit!
#Fri Jul 31 15:01:36 CEST 2015
build.number=0
#Build Number for ANT. Do not edit!
#Sat Aug 26 18:26:10 CEST 2017
build.number=2
34 changes: 18 additions & 16 deletions src/org/pmedv/blackboard/commands/BrowsePartsCommand.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ of the License, or (at your option) any later version.
import org.pmedv.blackboard.components.Part;
import org.pmedv.blackboard.dialogs.PartDialog;
import org.pmedv.blackboard.events.EditorChangedEvent;
import org.pmedv.blackboard.models.BoardEditorModel.BoardType;
import org.pmedv.blackboard.models.BoardEditorModel;
import org.pmedv.core.commands.AbstractEditorCommand;
import org.pmedv.core.context.AppContext;
import org.pmedv.core.dialogs.AbstractNiceDialog;
Expand Down Expand Up @@ -115,19 +115,19 @@ public void execute(ActionEvent e) {

// Check if the default part layer exists

// boolean onPartLayer = false;
//
// for (Layer layer : editor.getModel().getLayers()) {
// if (layer.getIndex() == BoardEditorModel.PART_LAYER) {
// part.setLayer(BoardEditorModel.PART_LAYER);
// onPartLayer = true;
// break;
// }
// }
//
// if (!onPartLayer) {
// part.setLayer(editor.getModel().getCurrentLayer().getIndex());
// }
boolean onPartLayer = false;

for (Layer layer : editor.getModel().getLayers()) {
if (layer.getIndex() == BoardEditorModel.PART_LAYER) {
part.setLayer(BoardEditorModel.PART_LAYER);
onPartLayer = true;
break;
}
}

if (!onPartLayer) {
part.setLayer(editor.getModel().getCurrentLayer().getIndex());
}

xLoc += 64;
yLoc += 64;
Expand All @@ -142,9 +142,11 @@ public void execute(ActionEvent e) {
}
else part.setName("");

AddItemCommand cmd = new AddItemCommand();
editor.getModel().getLayer(part.getLayer()).getItems().add(part);

/*AddItemCommand cmd = new AddItemCommand();
cmd.setItem(part);
cmd.execute(null);
cmd.execute(null);*/

if (dlg.getSelectedParts().size() == 1) {
editor.getSelectedItems().clear();
Expand Down