merged with josh

RealStandardStudios · Nov 4, 2014 · 478af10 · 478af10
1 parent fa8a0b9
commit 478af10
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 22 deletions.
diff --git a/src/view/objects/OtherCharacterRow.java b/src/view/objects/OtherCharacterRow.java
@@ -3,11 +3,6 @@
 import java.io.File;
 import java.io.IOException;
 
-import org.controlsfx.dialog.Dialog;
-import org.controlsfx.dialog.Dialogs;
-
-import pathfinder.data.Character.Character;
-import view.RootController;
 import javafx.event.ActionEvent;
 import javafx.event.EventHandler;
 import javafx.fxml.FXML;
@@ -18,6 +13,12 @@
 import jefXif.io.Data;
 import jefXif.view.RootLayoutController;
 
+import org.controlsfx.dialog.Dialog;
+import org.controlsfx.dialog.Dialogs;
+
+import pathfinder.data.Character.Character;
+import view.RootController;
+
 /**
  * @author Matthew
  *

diff --git a/src/view/partials/CharacterProfileController.java b/src/view/partials/CharacterProfileController.java
@@ -2,7 +2,6 @@
 
 import java.io.IOException;
 
-import javafx.beans.property.ObjectProperty;
 import javafx.collections.FXCollections;
 import javafx.event.EventHandler;
 import javafx.fxml.FXML;
@@ -80,8 +79,6 @@ public class CharacterProfileController extends MainWindowController {
 	public void initialize() {
 		columnClass.setCellValueFactory(cellData->cellData.getValue().getNameProperty());
 		columnLevels.setCellValueFactory(cellData->cellData.getValue().getLevelProp());
-		ObjectProperty<Integer> plz = ((RootController) getRoot()).getCharacter().getClasses()[0].getLevelProp();
-		int plzz = plz.get();
 	}
 
 	/**

diff --git a/src/view/partials/dialogs/LevelUpController.java b/src/view/partials/dialogs/LevelUpController.java
@@ -1,16 +1,5 @@
 package view.partials.dialogs;
 
-import java.util.ArrayList;
-
-import pathfinder.data.Effects.AbilityEffect;
-import pathfinder.data.Races.Traits.Trait;
-import javafx.event.ActionEvent;
-import javafx.event.Event;
-import javafx.fxml.FXML;
-import javafx.scene.control.Tab;
-import javafx.scene.control.TabPane;
-import javafx.scene.layout.AnchorPane;
-import jefXif.view.DialogController;
 /*
 public class LevelUpController extends DialogController implements jefXif.interfaces.PartialLoader
 {
@@ -78,3 +67,4 @@ public void handleOkay(ActionEvent event) {
 	
 }
 */
+
diff --git a/src/view/partials/dialogs/partials/FeatPartialController.java b/src/view/partials/dialogs/partials/FeatPartialController.java
@@ -2,16 +2,17 @@
 
 import java.io.File;
 
-import org.controlsfx.dialog.Dialog;
-import org.controlsfx.dialog.Dialogs;
-
 import javafx.collections.FXCollections;
 import javafx.collections.ObservableList;
 import javafx.fxml.FXML;
 import javafx.scene.control.ComboBox;
 import javafx.scene.control.Label;
 import javafx.scene.control.TableColumn;
 import javafx.scene.control.TableView;
+
+import org.controlsfx.dialog.Dialog;
+import org.controlsfx.dialog.Dialogs;
+
 import pathfinder.data.Feat;
 import pathfinder.data.FeatPrerequisite;