Cleanup.

git-moss · Oct 27, 2019 · 97d79cb · 97d79cb
1 parent 51e3798
commit 97d79cb
Show file tree

Hide file tree

Showing 10 changed files with 22 additions and 13 deletions.
diff --git a/src/main/java/de/mossgrabers/bitwig/framework/daw/HostImpl.java b/src/main/java/de/mossgrabers/bitwig/framework/daw/HostImpl.java
@@ -104,7 +104,7 @@ public boolean hasSlotChains ()
     }
 
 
-     /** {@inheritDoc} */
+    /** {@inheritDoc} */
     @Override
     public boolean canEditMarkers ()
     {

diff --git a/src/main/java/de/mossgrabers/bitwig/framework/daw/data/BrowserColumnItemImpl.java b/src/main/java/de/mossgrabers/bitwig/framework/daw/data/BrowserColumnItemImpl.java
@@ -99,7 +99,7 @@ public boolean isSelected ()
     @Override
     public int getHitCount ()
     {
-        return this.item instanceof BrowserFilterItem ? safeGetInteger (((BrowserFilterItem) this.item).hitCount ()) : 0;
+        return this.item instanceof BrowserFilterItem ? this.safeGetInteger (((BrowserFilterItem) this.item).hitCount ()) : 0;
     }
 
 

diff --git a/src/main/java/de/mossgrabers/controller/launchkey/LaunchkeyMiniMk3ControllerDefinition.java b/src/main/java/de/mossgrabers/controller/launchkey/LaunchkeyMiniMk3ControllerDefinition.java
@@ -21,6 +21,7 @@ public class LaunchkeyMiniMk3ControllerDefinition extends DefaultControllerDefin
 {
     private static final UUID EXTENSION_ID = UUID.fromString ("5359D5B1-28CD-4457-B49D-F8D3D7BC52B9");
 
+
     /**
      * Constructor.
      */
@@ -61,6 +62,14 @@ public LaunchkeyMiniMk3ControllerDefinition ()
                 break;
 
             case LINUX:
+                midiDiscoveryPairs.add (this.addDeviceDiscoveryPair (new String []
+                {
+                    "MK3 [hw:1,0,1]",
+                    "MK3 [hw:1,0,0]"
+                }, new String []
+                {
+                    "MK3 [hw:1,0,1]"
+                }));
                 midiDiscoveryPairs.add (this.addDeviceDiscoveryPair (new String []
                 {
                     "MK3 [hw:2,0,1]",

diff --git a/src/main/java/de/mossgrabers/controller/launchkey/LaunchkeyMiniMk3ControllerSetup.java b/src/main/java/de/mossgrabers/controller/launchkey/LaunchkeyMiniMk3ControllerSetup.java
@@ -141,7 +141,7 @@ protected void createSurface ()
         final IMidiAccess midiAccess = this.factory.createMidiAccess ();
         final IMidiOutput output = midiAccess.createOutput ();
         final IMidiInput input = midiAccess.createInput ("Pads", "80????", "90????", "81????", "91????", "82????", "92????", "83????", "93????", "84????", "94????", "85????", "95????", "86????", "96????", "87????", "97????", "88????", "98????", "89????", "99????", "8A????", "9A????", "8B????", "9B????", "8C????", "9C????", "8D????", "9D????", "8E????", "9E????");
-        IMidiInput inputKeys = midiAccess.createInput (1, "Keyboard", "8?????" /* Note off */,
+        final IMidiInput inputKeys = midiAccess.createInput (1, "Keyboard", "8?????" /* Note off */,
                 "9?????" /* Note on */, "B?01??" /* Modulation */, "B?40??" /* Sustainpedal */,
                 "E?????" /* Pitchbend */);
 

diff --git a/src/main/java/de/mossgrabers/controller/launchkey/view/SessionView.java b/src/main/java/de/mossgrabers/controller/launchkey/view/SessionView.java
@@ -153,13 +153,13 @@ public void drawGrid ()
 
     /** {@inheritDoc} */
     @Override
-    public void onGridNote (int note, int velocity)
+    public void onGridNote (final int note, final int velocity)
     {
         if (velocity == 0)
             return;
 
         final Pair<Integer, Integer> padPos = this.getPad (note);
-        int row = padPos.getValue ().intValue ();
+        final int row = padPos.getValue ().intValue ();
         if (row == 0 || this.padMode == null)
             super.onGridNote (note, velocity);
         else

diff --git a/src/main/java/de/mossgrabers/controller/launchpad/LaunchpadControllerSetup.java b/src/main/java/de/mossgrabers/controller/launchpad/LaunchpadControllerSetup.java
@@ -289,7 +289,7 @@ protected void registerContinuousCommands ()
             this.addContinuousCommand (ContinuousCommandID.get (ContinuousCommandID.KNOB1, i), LaunchpadControlSurface.LAUNCHPAD_FADER_1 + i, new FaderCommand (i, this.model, surface));
         final ViewManager viewManager = surface.getViewManager ();
 
-        Views [] views =
+        final Views [] views =
         {
             Views.PLAY,
             Views.PIANO,

diff --git a/src/main/java/de/mossgrabers/controller/push/PushControllerSetup.java b/src/main/java/de/mossgrabers/controller/push/PushControllerSetup.java
@@ -520,7 +520,7 @@ protected void registerContinuousCommands ()
         final ViewManager viewManager = surface.getViewManager ();
         viewManager.registerPitchbendCommand (new PitchbendCommand (this.model, surface));
 
-        Views [] views =
+        final Views [] views =
         {
             Views.PLAY,
             Views.PIANO,

diff --git a/src/main/java/de/mossgrabers/controller/push/mode/device/DeviceChainsMode.java b/src/main/java/de/mossgrabers/controller/push/mode/device/DeviceChainsMode.java
@@ -124,9 +124,9 @@ public void updateDisplay2 (final IGraphicDisplay display)
         for (int i = 0; i < 8; i++)
         {
             final boolean isTopMenuOn = this.getTopMenuEnablement (cd, hasPinning, i);
-            String bottomMenu = i < slotChains.length ? slotChains[i] : "";
+            final String bottomMenu = i < slotChains.length ? slotChains[i] : "";
             final String bottomMenuIcon = "";
-            boolean isBottomMenuOn = i < slotChains.length;
+            final boolean isBottomMenuOn = i < slotChains.length;
             display.addParameterElement (this.hostMenu[i], isTopMenuOn, bottomMenu, bottomMenuIcon, bottomMenuColor, isBottomMenuOn, "", 0, "", false, -1);
         }
     }

diff --git a/src/main/java/de/mossgrabers/controller/push/mode/device/DeviceParamsMode.java b/src/main/java/de/mossgrabers/controller/push/mode/device/DeviceParamsMode.java
@@ -422,7 +422,7 @@ public void updateDisplay2 (final IGraphicDisplay display)
         final IValueChanger valueChanger = this.model.getValueChanger ();
         for (int i = 0; i < parameterBank.getPageSize (); i++)
         {
-            final boolean isTopMenuOn = getTopMenuEnablement (cd, hasPinning, i);
+            final boolean isTopMenuOn = this.getTopMenuEnablement (cd, hasPinning, i);
 
             String bottomMenu;
             final String bottomMenuIcon;
@@ -476,7 +476,7 @@ protected boolean checkExists2 (final IGraphicDisplay display, final ICursorDevi
     }
 
 
-    protected boolean getTopMenuEnablement (final ICursorDevice cd, final boolean hasPinning, int index)
+    protected boolean getTopMenuEnablement (final ICursorDevice cd, final boolean hasPinning, final int index)
     {
         switch (index)
         {

diff --git a/src/main/java/de/mossgrabers/framework/view/AbstractSessionView.java b/src/main/java/de/mossgrabers/framework/view/AbstractSessionView.java
@@ -358,8 +358,8 @@ protected SessionColor getPadColor (final ISlot slot, final boolean isArmed)
     protected Pair<Integer, Integer> getPad (final int note)
     {
         final int index = note - 36;
-        int t = index % this.columns;
-        int s = this.rows - 1 - index / this.columns;
+        final int t = index % this.columns;
+        final int s = this.rows - 1 - index / this.columns;
         final C configuration = this.surface.getConfiguration ();
         return configuration.isFlipSession () ? new Pair<> (Integer.valueOf (s), Integer.valueOf (t)) : new Pair<> (Integer.valueOf (t), Integer.valueOf (s));
     }