Skip to content

Commit c2429b0

Browse files
committed
bug loading projects without title props
1 parent cd9503b commit c2429b0

File tree

8 files changed

+12
-12
lines changed

8 files changed

+12
-12
lines changed

CHANGELOG

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
[0.2.0]
2-
- COMPOSER: Threads for long tasks to show UI message status.
2+
- COMPOSER: Fixed NullPointer error when creating project
3+
- COMPOSER: Threads for long tasks to show UI message status
34
- COMPOSER: FIXED packaging with embedded JRE.
45
- ENGINE: CreditsScreen fonts now obtained from Skin
56

adventure-composer/build.gradle

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ ext {
66
}
77

88
group = 'org.bladecoder.engineeditor'
9-
version = engineVersion
109

1110
mainClassName = 'org.bladecoder.engineeditor.Main'
1211

adventure-composer/src/main/java/org/bladecoder/engineeditor/model/Project.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -354,8 +354,8 @@ public void setProjectProperty(String titleProp, String value) {
354354
projectConfig.setProperty(titleProp, value);
355355
}
356356

357-
public String getProjectProperty(String titleProp) {
358-
return projectConfig.getProperty(titleProp);
357+
public String getProjectProperty(String titleProp, String def) {
358+
return projectConfig.getProperty(titleProp, def);
359359
}
360360

361361
public void loadChapter(String selChapter) throws ParserConfigurationException, SAXException, IOException {

adventure-composer/src/main/java/org/bladecoder/engineeditor/ui/WorldProps.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,7 @@
2828
public class WorldProps extends PropertyTable {
2929

3030
public static final String WIDTH_PROP = "width";
31-
public static final String HEIGHT_PROP = "height";
32-
31+
public static final String HEIGHT_PROP = "height";
3332
public static final String TITLE_PROP = "title";
3433

3534
// TableModelListener tableModelListener = new TableModelListener() {
@@ -70,7 +69,7 @@ private void setProject() {
7069
clear();
7170
addProperty(WIDTH_PROP, Ctx.project.getWorld().getWidth());
7271
addProperty(HEIGHT_PROP, Ctx.project.getWorld().getHeight());
73-
addProperty(TITLE_PROP, Ctx.project.getProjectProperty(TITLE_PROP));
72+
addProperty(TITLE_PROP, Ctx.project.getTitle());
7473

7574
invalidateHierarchy();
7675
}

adventure-composer/src/main/java/org/bladecoder/engineeditor/ui/components/PropertyTable.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,8 @@ public void addProperty(String name, String value, Types type) {
5050
if(type == Types.BOOLEAN) {
5151
SelectBox<String> sb= new SelectBox<String>(skin);
5252
sb.setItems(BOOLEAN_VALUES);
53-
sb.setSelected(value);
53+
if(value!=null)
54+
sb.setSelected(value);
5455
sb.setName(name);
5556
add(sb).expandX().left();
5657

@@ -66,7 +67,7 @@ public void changed(
6667
}
6768
});
6869
} else {
69-
TextField tf = new TextField( value, skin);
70+
TextField tf = new TextField( value==null?"":value, skin);
7071
tf.setName(name);
7172
add(tf).expandX().left();
7273

adventure-composer/src/main/resources/versions.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
version=0.2.0-SNAPSHOT
1+
version=0.2.0
22
libgdxVersion=1.3.1
33
libgdxNightlyVersion=1.3.2-SNAPSHOT
44
roboVMVersion=0.0.14

blade-engine/build.gradle

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ ext {
55
}
66

77
group = 'org.bladecoder.engine'
8-
version = engineVersion
98

109
apply plugin: 'maven-publish'
1110

build.gradle

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
allprojects {
22
apply plugin: "eclipse"
33
apply plugin: "idea"
4+
5+
version = '0.2.0'
46

57
ext {
68
gdxVersion = '1.3.1'
7-
engineVersion = '0.2.0-SNAPSHOT'
89
}
910

1011
repositories {

0 commit comments

Comments
 (0)