From 563d10a6211de09029ebda712c180407c7ceb9e0 Mon Sep 17 00:00:00 2001
From: tobias <tobias.ullerich@icloud.com>
Date: Sat, 6 Aug 2016 15:33:28 +0200
Subject: [PATCH] Add Comments & fixing bugs
---
.../src/de/tobias/playpad/PlayPadMain.java | 9 ++++----
.../layout/desktop/DesktopPadView.java | 11 +++++++++-
.../playpad/layout/touch/TouchPadView.java | 6 ++++++
.../view/MapperOverviewViewController.java | 2 +-
.../main/MainViewControllerV2.java | 9 ++++----
.../option/MappingTabViewController.java | 7 +++++--
.../pad/conntent/PadContentConnect.java | 1 +
.../tobias/playpad/pad/view/IPadViewV2.java | 21 ++++++++++++++++++-
8 files changed, 53 insertions(+), 13 deletions(-)
diff --git a/PlayWall/src/de/tobias/playpad/PlayPadMain.java b/PlayWall/src/de/tobias/playpad/PlayPadMain.java
index 0439b37f..861720fe 100644
--- a/PlayWall/src/de/tobias/playpad/PlayPadMain.java
+++ b/PlayWall/src/de/tobias/playpad/PlayPadMain.java
@@ -131,7 +131,8 @@ public class PlayPadMain extends Application implements LocalizationDelegate, Pr
try {
Image stageIcon = new Image(iconPath);
PlayPadMain.stageIcon = Optional.of(stageIcon);
- } catch (Exception e) {}
+ } catch (Exception e) {
+ }
/*
* Setup
@@ -195,9 +196,6 @@ public class PlayPadMain extends Application implements LocalizationDelegate, Pr
// Midi
DeviceRegistry.getFactoryInstance().registerDevice(PD12.NAME, PD12.class);
- // Mapper
- MapperRegistry.setOverviewViewController(new MapperOverviewViewController());
-
Profile.registerListener(this);
try {
@@ -220,6 +218,9 @@ public class PlayPadMain extends Application implements LocalizationDelegate, Pr
| NoSuchComponentException e) {
e.printStackTrace();
}
+
+ // Mapper
+ MapperRegistry.setOverviewViewController(new MapperOverviewViewController());
}
private void setupPlugins(Path pluginPath) throws IOException, MalformedURLException {
diff --git a/PlayWall/src/de/tobias/playpad/layout/desktop/DesktopPadView.java b/PlayWall/src/de/tobias/playpad/layout/desktop/DesktopPadView.java
index 4994b8d2..795110a5 100644
--- a/PlayWall/src/de/tobias/playpad/layout/desktop/DesktopPadView.java
+++ b/PlayWall/src/de/tobias/playpad/layout/desktop/DesktopPadView.java
@@ -3,6 +3,7 @@ package de.tobias.playpad.layout.desktop;
import de.tobias.playpad.PlayPadPlugin;
import de.tobias.playpad.PseudoClasses;
import de.tobias.playpad.pad.Pad;
+import de.tobias.playpad.pad.PadContentRegistry;
import de.tobias.playpad.pad.conntent.PadContent;
import de.tobias.playpad.pad.conntent.PadContentConnect;
import de.tobias.playpad.pad.conntent.play.Pauseable;
@@ -131,11 +132,19 @@ public class DesktopPadView implements IPadViewV2 {
PadContent content = pad.getContent();
if (content != null) {
try {
- PadContentConnect connect = PlayPadPlugin.getRegistryCollection().getPadContents().getComponent(content.getType());
+ PadContentRegistry registry = PlayPadPlugin.getRegistryCollection().getPadContents();
+ PadContentConnect connect = registry.getComponent(content.getType());
+
previewContent = connect.getPadContentPreview(pad, preview);
Node node = previewContent.getNode();
node.getStyleClass().addAll("pad-title", "pad" + pad.getIndex() + "-title");
+
+ // Copy Pseudoclasses
+ for (PseudoClass pseudoClass : superRoot.getPseudoClassStates()) {
+ node.pseudoClassStateChanged(pseudoClass, true);
+ }
+
preview.getChildren().setAll(node);
return;
} catch (NoSuchComponentException e) {
diff --git a/PlayWall/src/de/tobias/playpad/layout/touch/TouchPadView.java b/PlayWall/src/de/tobias/playpad/layout/touch/TouchPadView.java
index d0666f0e..0b540822 100644
--- a/PlayWall/src/de/tobias/playpad/layout/touch/TouchPadView.java
+++ b/PlayWall/src/de/tobias/playpad/layout/touch/TouchPadView.java
@@ -110,6 +110,12 @@ public class TouchPadView implements IPadViewV2 {
Node node = previewContent.getNode();
node.getStyleClass().addAll("pad-title", "pad" + pad.getIndex() + "-title");
+
+ // Copy Pseudoclasses
+ for (PseudoClass pseudoClass : superRoot.getPseudoClassStates()) {
+ node.pseudoClassStateChanged(pseudoClass, true);
+ }
+
preview.getChildren().setAll(node);
return;
} catch (NoSuchComponentException e) {
diff --git a/PlayWall/src/de/tobias/playpad/view/MapperOverviewViewController.java b/PlayWall/src/de/tobias/playpad/view/MapperOverviewViewController.java
index 44f42324..9a996c2a 100644
--- a/PlayWall/src/de/tobias/playpad/view/MapperOverviewViewController.java
+++ b/PlayWall/src/de/tobias/playpad/view/MapperOverviewViewController.java
@@ -62,7 +62,7 @@ public class MapperOverviewViewController implements IMapperOverviewViewControll
Set<String> types = registry.getTypes();
types.stream().sorted().forEach(item ->
{
- Button button = new Button(registry.toString(), new FontIcon(FontAwesomeType.PLUS_CIRCLE));
+ Button button = new Button(item.toString(), new FontIcon(FontAwesomeType.PLUS_CIRCLE));
button.setContentDisplay(ContentDisplay.TOP);
button.setPrefWidth(150);
diff --git a/PlayWall/src/de/tobias/playpad/viewcontroller/main/MainViewControllerV2.java b/PlayWall/src/de/tobias/playpad/viewcontroller/main/MainViewControllerV2.java
index 29fb2c9b..ef839e18 100644
--- a/PlayWall/src/de/tobias/playpad/viewcontroller/main/MainViewControllerV2.java
+++ b/PlayWall/src/de/tobias/playpad/viewcontroller/main/MainViewControllerV2.java
@@ -182,6 +182,9 @@ public class MainViewControllerV2 extends ViewController implements IMainViewCon
}
public void setMainLayout(MainLayoutConnect mainLayoutConnect) {
+ removePadsFromView();
+ removePadViews();
+
this.mainLayout = mainLayoutConnect;
initMainLayout();
}
@@ -196,9 +199,6 @@ public class MainViewControllerV2 extends ViewController implements IMainViewCon
menuToolbarViewController.getVolumeSlider().valueProperty().removeListener(volumeChangeListener);
}
- removePadsFromView();
- removePadViews();
-
headerBox.getChildren().clear();
MenuToolbarViewController newMenuToolbarViewController = mainLayout.createMenuToolbar(this);
headerBox.getChildren().add(newMenuToolbarViewController.getParent());
@@ -512,7 +512,8 @@ public class MainViewControllerV2 extends ViewController implements IMainViewCon
{
try {
Thread.sleep(PlayPadMain.displayTimeMillis * 2);
- } catch (Exception e) {}
+ } catch (Exception e) {
+ }
Platform.runLater(() ->
{
if (menuToolbarViewController != null)
diff --git a/PlayWall/src/de/tobias/playpad/viewcontroller/option/MappingTabViewController.java b/PlayWall/src/de/tobias/playpad/viewcontroller/option/MappingTabViewController.java
index c58323cb..5d07685f 100644
--- a/PlayWall/src/de/tobias/playpad/viewcontroller/option/MappingTabViewController.java
+++ b/PlayWall/src/de/tobias/playpad/viewcontroller/option/MappingTabViewController.java
@@ -139,7 +139,9 @@ public class MappingTabViewController extends SettingsTabViewController implemen
} else {
detailView.getChildren().remove(mapperOverviewViewController.getParent());
}
- } catch (Exception e) {}
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
}
// Tab Utils
@@ -151,7 +153,8 @@ public class MappingTabViewController extends SettingsTabViewController implemen
}
@Override
- public void saveSettings(Profile profile) {}
+ public void saveSettings(Profile profile) {
+ }
@Override
public boolean needReload() {
diff --git a/PlayWallCore/src/de/tobias/playpad/pad/conntent/PadContentConnect.java b/PlayWallCore/src/de/tobias/playpad/pad/conntent/PadContentConnect.java
index c00fd962..88dccf72 100644
--- a/PlayWallCore/src/de/tobias/playpad/pad/conntent/PadContentConnect.java
+++ b/PlayWallCore/src/de/tobias/playpad/pad/conntent/PadContentConnect.java
@@ -10,6 +10,7 @@ import de.tobias.playpad.viewcontroller.SettingsTabViewController;
import de.tobias.utils.util.FileUtils;
import javafx.scene.layout.Pane;
+// COMMENT PadContentConnect
public abstract class PadContentConnect implements Comparable<PadContentConnect>, Displayable {
public abstract String getType();
diff --git a/PlayWallCore/src/de/tobias/playpad/pad/view/IPadViewV2.java b/PlayWallCore/src/de/tobias/playpad/pad/view/IPadViewV2.java
index d14022dc..32942fd3 100644
--- a/PlayWallCore/src/de/tobias/playpad/pad/view/IPadViewV2.java
+++ b/PlayWallCore/src/de/tobias/playpad/pad/view/IPadViewV2.java
@@ -60,11 +60,30 @@ public interface IPadViewV2 {
*/
public void showBusyView(boolean enable);
- // COMMENT IPadViewV2
+ /**
+ * Aktiviert eine Pseudoclass für die View
+ *
+ * @param playCalss
+ * Pseudoclass
+ * @param b
+ * <code>true</code> Aktiv
+ */
public void pseudoClassState(PseudoClass playCalss, boolean b);
+ /**
+ * Setzt den Style für den Root Node der PadView.
+ *
+ * @param string
+ * Style
+ */
public void setStyle(String string);
+ /**
+ * Aktiviert des Error Labels, damit es angezeigt wird.
+ *
+ * @param b
+ * <code>true</code> Sichtbar
+ */
public void setErrorLabelActive(boolean b);
/**
--
GitLab