Skip to content

Commit 3f29d8b

Browse files
stanhebbenstanhebben
committed
- Refactored usage of live objects in the IDE
- Save collapse state of the project browser tree
1 parent da051f5 commit 3f29d8b

File tree

83 files changed

+582
-413
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

83 files changed

+582
-413
lines changed

‎DrawableGui/build.gradle‎

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,5 @@ if (!hasProperty('mainClass')) {
1414
}
1515

1616
dependencies {
17-
// TODO: Add dependencies here
18-
// but note that JUnit should have already been added in parent.gradle.
19-
// By default, only the Maven Central Repository is specified in
20-
// parent.gradle.
21-
//
22-
// You can read more about how to add dependency here:
23-
// http://www.gradle.org/docs/current/userguide/dependency_management.html#sec:how_to_declare_your_dependencies
17+
compile project(':Shared')
2418
}

‎DrawableGui/src/main/java/org/openzen/drawablegui/DButton.java‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,13 @@
55
*/
66
package org.openzen.drawablegui;
77

8+
import live.LiveBool;
9+
import live.LiveObject;
10+
import live.LiveString;
11+
import live.MutableLiveObject;
12+
813
import org.openzen.drawablegui.draw.DDrawnShape;
914
import org.openzen.drawablegui.draw.DDrawnText;
10-
import org.openzen.drawablegui.live.LiveBool;
11-
import org.openzen.drawablegui.live.LiveObject;
12-
import org.openzen.drawablegui.live.LiveString;
13-
import org.openzen.drawablegui.live.MutableLiveObject;
1415
import org.openzen.drawablegui.style.DShadow;
1516
import org.openzen.drawablegui.style.DStyleClass;
1617

‎DrawableGui/src/main/java/org/openzen/drawablegui/DComponent.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
*/
66
package org.openzen.drawablegui;
77

8-
import org.openzen.drawablegui.live.LiveObject;
8+
import live.LiveObject;
99

1010
/**
1111
*

‎DrawableGui/src/main/java/org/openzen/drawablegui/DEmptyView.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
*/
66
package org.openzen.drawablegui;
77

8-
import org.openzen.drawablegui.live.ImmutableLiveObject;
9-
import org.openzen.drawablegui.live.LiveObject;
8+
import live.ImmutableLiveObject;
9+
import live.LiveObject;
1010

1111
/**
1212
*

‎DrawableGui/src/main/java/org/openzen/drawablegui/DInputField.java‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,15 @@
55
*/
66
package org.openzen.drawablegui;
77

8+
import java.util.function.BiConsumer;
9+
import listeners.ListenerHandle;
10+
import live.LiveObject;
11+
import live.MutableLiveObject;
12+
import live.MutableLiveString;
13+
814
import org.openzen.drawablegui.draw.DDrawnRectangle;
915
import org.openzen.drawablegui.draw.DDrawnShape;
1016
import org.openzen.drawablegui.draw.DDrawnText;
11-
import org.openzen.drawablegui.listeners.ListenerHandle;
12-
import org.openzen.drawablegui.live.LiveObject;
13-
import org.openzen.drawablegui.live.LiveString;
14-
import org.openzen.drawablegui.live.MutableLiveObject;
15-
import org.openzen.drawablegui.live.MutableLiveString;
1617
import org.openzen.drawablegui.style.DDimension;
1718
import org.openzen.drawablegui.style.DStyleClass;
1819

@@ -22,7 +23,7 @@
2223
*/
2324
public class DInputField implements DComponent {
2425
public final MutableLiveString value;
25-
private final ListenerHandle<LiveString.Listener> valueListener;
26+
private final ListenerHandle<BiConsumer<String, String>> valueListener;
2627

2728
private final DStyleClass styleClass;
2829
private final MutableLiveObject<DSizing> sizing = DSizing.create();

‎DrawableGui/src/main/java/org/openzen/drawablegui/DLabel.java‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,13 @@
55
*/
66
package org.openzen.drawablegui;
77

8+
import java.util.function.BiConsumer;
9+
import listeners.ListenerHandle;
10+
import live.LiveString;
11+
import live.LiveObject;
12+
import live.MutableLiveObject;
13+
814
import org.openzen.drawablegui.draw.DDrawnText;
9-
import org.openzen.drawablegui.listeners.ListenerHandle;
10-
import org.openzen.drawablegui.live.LiveObject;
11-
import org.openzen.drawablegui.live.LiveString;
12-
import org.openzen.drawablegui.live.MutableLiveObject;
1315
import org.openzen.drawablegui.style.DStyleClass;
1416

1517
/**
@@ -20,7 +22,7 @@ public class DLabel implements DComponent {
2022
private final LiveString label;
2123
private final DStyleClass styleClass;
2224
private final MutableLiveObject<DSizing> sizing = DSizing.create();
23-
private final ListenerHandle<LiveString.Listener> labelListener;
25+
private final ListenerHandle<BiConsumer<String, String>> labelListener;
2426

2527
private DComponentContext context;
2628
private DIRectangle bounds;

‎DrawableGui/src/main/java/org/openzen/drawablegui/DSimpleTooltip.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,8 @@
55
*/
66
package org.openzen.drawablegui;
77

8-
import org.openzen.drawablegui.live.LiveString;
8+
import live.LiveString;
9+
910
import org.openzen.drawablegui.style.DStyleClass;
1011

1112
/**

‎DrawableGui/src/main/java/org/openzen/drawablegui/DSimpleTooltipComponent.java‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,14 @@
55
*/
66
package org.openzen.drawablegui;
77

8+
import java.util.function.BiConsumer;
9+
import listeners.ListenerHandle;
10+
import live.LiveObject;
11+
import live.LiveString;
12+
import live.MutableLiveObject;
13+
814
import org.openzen.drawablegui.draw.DDrawnRectangle;
915
import org.openzen.drawablegui.draw.DDrawnText;
10-
import org.openzen.drawablegui.listeners.ListenerHandle;
11-
import org.openzen.drawablegui.live.LiveObject;
12-
import org.openzen.drawablegui.live.LiveString;
13-
import org.openzen.drawablegui.live.MutableLiveObject;
1416
import org.openzen.drawablegui.style.DStyleClass;
1517

1618
/**
@@ -21,7 +23,7 @@ public class DSimpleTooltipComponent implements DComponent {
2123
private final DStyleClass styleClass;
2224
private final LiveString tooltip;
2325
private final MutableLiveObject<DSizing> sizing = DSizing.create();
24-
private final ListenerHandle<LiveString.Listener> tooltipListener;
26+
private final ListenerHandle<BiConsumer<String, String>> tooltipListener;
2527

2628
private DComponentContext context;
2729
private DIRectangle bounds;

‎DrawableGui/src/main/java/org/openzen/drawablegui/DSizing.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
*/
66
package org.openzen.drawablegui;
77

8-
import org.openzen.drawablegui.live.MutableLiveObject;
9-
import org.openzen.drawablegui.live.SimpleLiveObject;
8+
import live.MutableLiveObject;
9+
import live.SimpleLiveObject;
1010

1111
/**
1212
*

‎DrawableGui/src/main/java/org/openzen/drawablegui/DUIWindow.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
*/
66
package org.openzen.drawablegui;
77

8-
import org.openzen.drawablegui.live.LiveBool;
9-
import org.openzen.drawablegui.live.LiveObject;
8+
import live.LiveBool;
9+
import live.LiveObject;
1010

1111
/**
1212
*

0 commit comments

Comments
 (0)