Skip to content

Commit efced75

Browse files
author
nicolaiparlog
committed
Merge branch 'develop' into master.
2 parents e8d57b0 + fd8ff64 commit efced75

File tree

99 files changed

+8293
-1
lines changed

Some content is hidden

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

99 files changed

+8293
-1
lines changed

‎.gitignore

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,16 @@
44
.mtj.tmp/
55

66
# Package Files #
7-
*.jar
87
*.war
98
*.ear
109

1110
# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
1211
hs_err_pid*
12+
13+
# compilation folders
14+
/bin/
15+
/target/
16+
17+
# Eclipse project information generated by Maven
18+
.classpath
19+
.project

‎.settings/org.eclipse.core.resources.prefs

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
eclipse.preferences.version=1
2+
encoding//src/demo/java=UTF-8
3+
encoding//src/main/java=UTF-8
4+
encoding//src/test/java=UTF-8
5+
encoding/<project>=UTF-8

‎.settings/org.eclipse.jdt.core.prefs

Lines changed: 398 additions & 0 deletions
Large diffs are not rendered by default.

‎.settings/org.eclipse.jdt.ui.prefs

Lines changed: 123 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,123 @@
1+
cleanup.add_default_serial_version_id=false
2+
cleanup.add_generated_serial_version_id=true
3+
cleanup.add_missing_annotations=true
4+
cleanup.add_missing_deprecated_annotations=false
5+
cleanup.add_missing_methods=true
6+
cleanup.add_missing_nls_tags=false
7+
cleanup.add_missing_override_annotations=true
8+
cleanup.add_missing_override_annotations_interface_methods=true
9+
cleanup.add_serial_version_id=true
10+
cleanup.always_use_blocks=false
11+
cleanup.always_use_parentheses_in_expressions=false
12+
cleanup.always_use_this_for_non_static_field_access=false
13+
cleanup.always_use_this_for_non_static_method_access=false
14+
cleanup.convert_functional_interfaces=true
15+
cleanup.convert_to_enhanced_for_loop=false
16+
cleanup.correct_indentation=true
17+
cleanup.format_source_code=true
18+
cleanup.format_source_code_changes_only=false
19+
cleanup.insert_inferred_type_arguments=false
20+
cleanup.make_local_variable_final=true
21+
cleanup.make_parameters_final=false
22+
cleanup.make_private_fields_final=true
23+
cleanup.make_type_abstract_if_missing_method=false
24+
cleanup.make_variable_declarations_final=false
25+
cleanup.never_use_blocks=true
26+
cleanup.never_use_parentheses_in_expressions=true
27+
cleanup.organize_imports=true
28+
cleanup.qualify_static_field_accesses_with_declaring_class=false
29+
cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true
30+
cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true
31+
cleanup.qualify_static_member_accesses_with_declaring_class=true
32+
cleanup.qualify_static_method_accesses_with_declaring_class=false
33+
cleanup.remove_private_constructors=true
34+
cleanup.remove_redundant_type_arguments=true
35+
cleanup.remove_trailing_whitespaces=true
36+
cleanup.remove_trailing_whitespaces_all=true
37+
cleanup.remove_trailing_whitespaces_ignore_empty=false
38+
cleanup.remove_unnecessary_casts=true
39+
cleanup.remove_unnecessary_nls_tags=true
40+
cleanup.remove_unused_imports=true
41+
cleanup.remove_unused_local_variables=false
42+
cleanup.remove_unused_private_fields=true
43+
cleanup.remove_unused_private_members=false
44+
cleanup.remove_unused_private_methods=true
45+
cleanup.remove_unused_private_types=true
46+
cleanup.sort_members=false
47+
cleanup.sort_members_all=false
48+
cleanup.use_anonymous_class_creation=false
49+
cleanup.use_blocks=true
50+
cleanup.use_blocks_only_for_return_and_throw=false
51+
cleanup.use_lambda=true
52+
cleanup.use_parentheses_in_expressions=false
53+
cleanup.use_this_for_non_static_field_access=false
54+
cleanup.use_this_for_non_static_field_access_only_if_necessary=true
55+
cleanup.use_this_for_non_static_method_access=false
56+
cleanup.use_this_for_non_static_method_access_only_if_necessary=true
57+
cleanup.use_type_arguments=false
58+
cleanup_profile=_'nipa'
59+
cleanup_settings_version=2
60+
eclipse.preferences.version=1
61+
editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true
62+
formatter_profile=_nipa
63+
formatter_settings_version=12
64+
org.eclipse.jdt.ui.javadoc=false
65+
org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8" standalone\="no"?><templates><template autoinsert\="false" context\="gettercomment_context" deleted\="false" description\="Comment for getter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.gettercomment" name\="gettercomment">/**\r\n * @return the ${bare_field_name}\r\n */</template><template autoinsert\="true" context\="settercomment_context" deleted\="false" description\="Comment for setter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.settercomment" name\="settercomment">/**\r\n * @param ${param} the ${bare_field_name} to set\r\n */</template><template autoinsert\="true" context\="constructorcomment_context" deleted\="false" description\="Comment for created constructors" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment">/**\r\n * ${tags}\r\n */</template><template autoinsert\="true" context\="filecomment_context" deleted\="false" description\="Comment for created Java files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.filecomment" name\="filecomment">/**\r\n * \r\n */</template><template autoinsert\="false" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\r\n * ${tags}\r\n */</template><template autoinsert\="true" context\="fieldcomment_context" deleted\="false" description\="Comment for fields" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment">/**\r\n * \r\n */</template><template autoinsert\="true" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name\="methodcomment">/**\r\n * ${tags}\r\n */</template><template autoinsert\="false" context\="overridecomment_context" deleted\="false" description\="Comment for overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name\="overridecomment">/**\r\n * {@inheritDoc}\r\n */</template><template autoinsert\="true" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\r\n * ${tags}\r\n * ${see_to_target}\r\n */</template><template autoinsert\="true" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.newtype" name\="newtype">${filecomment}\r\n${package_declaration}\r\n\r\n${typecomment}\r\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.classbody" name\="classbody">\r\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\r\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.enumbody" name\="enumbody">\r\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\r\n</template><template autoinsert\="true" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">// ${todo} Auto-generated catch block\r\n${exception_var}.printStackTrace();</template><template autoinsert\="true" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">// ${todo} Auto-generated method stub\r\n${body_statement}</template><template autoinsert\="true" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}\r\n// ${todo} Auto-generated constructor stub</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template></templates>
66+
sp_cleanup.add_default_serial_version_id=true
67+
sp_cleanup.add_generated_serial_version_id=false
68+
sp_cleanup.add_missing_annotations=true
69+
sp_cleanup.add_missing_deprecated_annotations=true
70+
sp_cleanup.add_missing_methods=false
71+
sp_cleanup.add_missing_nls_tags=false
72+
sp_cleanup.add_missing_override_annotations=true
73+
sp_cleanup.add_missing_override_annotations_interface_methods=true
74+
sp_cleanup.add_serial_version_id=false
75+
sp_cleanup.always_use_blocks=false
76+
sp_cleanup.always_use_parentheses_in_expressions=false
77+
sp_cleanup.always_use_this_for_non_static_field_access=false
78+
sp_cleanup.always_use_this_for_non_static_method_access=false
79+
sp_cleanup.convert_functional_interfaces=true
80+
sp_cleanup.convert_to_enhanced_for_loop=false
81+
sp_cleanup.correct_indentation=true
82+
sp_cleanup.format_source_code=true
83+
sp_cleanup.format_source_code_changes_only=false
84+
sp_cleanup.insert_inferred_type_arguments=false
85+
sp_cleanup.make_local_variable_final=true
86+
sp_cleanup.make_parameters_final=false
87+
sp_cleanup.make_private_fields_final=true
88+
sp_cleanup.make_type_abstract_if_missing_method=false
89+
sp_cleanup.make_variable_declarations_final=false
90+
sp_cleanup.never_use_blocks=true
91+
sp_cleanup.never_use_parentheses_in_expressions=true
92+
sp_cleanup.on_save_use_additional_actions=true
93+
sp_cleanup.organize_imports=true
94+
sp_cleanup.qualify_static_field_accesses_with_declaring_class=false
95+
sp_cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true
96+
sp_cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true
97+
sp_cleanup.qualify_static_member_accesses_with_declaring_class=true
98+
sp_cleanup.qualify_static_method_accesses_with_declaring_class=false
99+
sp_cleanup.remove_private_constructors=true
100+
sp_cleanup.remove_redundant_type_arguments=false
101+
sp_cleanup.remove_trailing_whitespaces=true
102+
sp_cleanup.remove_trailing_whitespaces_all=true
103+
sp_cleanup.remove_trailing_whitespaces_ignore_empty=false
104+
sp_cleanup.remove_unnecessary_casts=true
105+
sp_cleanup.remove_unnecessary_nls_tags=false
106+
sp_cleanup.remove_unused_imports=true
107+
sp_cleanup.remove_unused_local_variables=false
108+
sp_cleanup.remove_unused_private_fields=true
109+
sp_cleanup.remove_unused_private_members=false
110+
sp_cleanup.remove_unused_private_methods=true
111+
sp_cleanup.remove_unused_private_types=true
112+
sp_cleanup.sort_members=false
113+
sp_cleanup.sort_members_all=false
114+
sp_cleanup.use_anonymous_class_creation=false
115+
sp_cleanup.use_blocks=true
116+
sp_cleanup.use_blocks_only_for_return_and_throw=false
117+
sp_cleanup.use_lambda=true
118+
sp_cleanup.use_parentheses_in_expressions=false
119+
sp_cleanup.use_this_for_non_static_field_access=false
120+
sp_cleanup.use_this_for_non_static_field_access_only_if_necessary=true
121+
sp_cleanup.use_this_for_non_static_method_access=false
122+
sp_cleanup.use_this_for_non_static_method_access_only_if_necessary=true
123+
sp_cleanup.use_type_arguments=false

‎.settings/org.eclipse.m2e.core.prefs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
activeProfiles=
2+
eclipse.preferences.version=1
3+
resolveWorkspaceProjects=true
4+
version=1

‎pom.xml

Lines changed: 93 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,93 @@
1+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
2+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
3+
<modelVersion>4.0.0</modelVersion>
4+
5+
<groupId>org.codefx.libfx</groupId>
6+
<artifactId>LibFX</artifactId>
7+
<version>0.1.0</version>
8+
<packaging>jar</packaging>
9+
10+
<name>LibFX</name>
11+
<url>http://libfx.codefx.org</url>
12+
<description>LibFX provides utility classes for JavaFX.</description>
13+
<scm>
14+
<url>https://github.com/CodeFX-org/LibFX</url>
15+
</scm>
16+
<issueManagement>
17+
<url>https://github.com/CodeFX-org/LibFX/issues</url>
18+
<system>GitHub</system>
19+
</issueManagement>
20+
21+
<organization>
22+
<name>CodeFX</name>
23+
<url>http://codefx.org</url>
24+
</organization>
25+
26+
<properties>
27+
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
28+
</properties>
29+
30+
<dependencies>
31+
<dependency>
32+
<groupId>junit</groupId>
33+
<artifactId>junit</artifactId>
34+
<version>4.11</version>
35+
<scope>test</scope>
36+
</dependency>
37+
<dependency>
38+
<groupId>org.mockito</groupId>
39+
<artifactId>mockito-all</artifactId>
40+
<version>1.9.5</version>
41+
<scope>test</scope>
42+
</dependency>
43+
</dependencies>
44+
45+
<build>
46+
<resources>
47+
<resource>
48+
<directory>src/demo/java</directory>
49+
<excludes>
50+
<exclude>**/*.java</exclude>
51+
</excludes>
52+
</resource>
53+
</resources>
54+
<plugins>
55+
<plugin>
56+
<groupId>org.apache.maven.plugins</groupId>
57+
<artifactId>maven-compiler-plugin</artifactId>
58+
<version>3.1</version>
59+
<configuration>
60+
<source>1.8</source>
61+
<target>1.8</target>
62+
</configuration>
63+
</plugin>
64+
<plugin>
65+
<groupId>org.apache.maven.plugins</groupId>
66+
<artifactId>maven-source-plugin</artifactId>
67+
<version>2.3</version>
68+
<executions>
69+
<execution>
70+
<id>attach-sources</id>
71+
<goals>
72+
<goal>jar</goal>
73+
</goals>
74+
</execution>
75+
</executions>
76+
</plugin>
77+
<plugin>
78+
<groupId>org.apache.maven.plugins</groupId>
79+
<artifactId>maven-javadoc-plugin</artifactId>
80+
<version>2.9.1</version>
81+
<executions>
82+
<execution>
83+
<id>attach-javadocs</id>
84+
<goals>
85+
<goal>jar</goal>
86+
</goals>
87+
</execution>
88+
</executions>
89+
</plugin>
90+
</plugins>
91+
</build>
92+
93+
</project>

‎src/demo/java/org/codefx/libfx/nesting/Employee.java

Lines changed: 92 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,92 @@
1+
package org.codefx.libfx.nesting;
2+
3+
import javafx.beans.property.DoubleProperty;
4+
import javafx.beans.property.ObjectProperty;
5+
import javafx.beans.property.Property;
6+
import javafx.beans.property.SimpleDoubleProperty;
7+
import javafx.beans.property.SimpleObjectProperty;
8+
import javafx.beans.property.SimpleStringProperty;
9+
import javafx.beans.property.StringProperty;
10+
11+
/**
12+
* A simple demo class which represents an employee.
13+
*/
14+
class Employee {
15+
16+
/**
17+
* The salary.
18+
*/
19+
private final DoubleProperty salary;
20+
21+
/**
22+
* The address.
23+
*/
24+
private final ObjectProperty<Address> address;
25+
26+
/**
27+
* Creates a new employee with the specified salary.
28+
*
29+
* @param initialSalary
30+
* the employee's initial salary
31+
* @param streetName
32+
* the name of the street the employee lives in
33+
*/
34+
public Employee(double initialSalary, String streetName) {
35+
this.salary = new SimpleDoubleProperty(this, "salary", initialSalary);
36+
this.address = new SimpleObjectProperty<>(this, "address", new Address(streetName));
37+
}
38+
39+
/**
40+
* The salary.
41+
*
42+
* @return the salary as a property
43+
*/
44+
public DoubleProperty salaryProperty() {
45+
return salary;
46+
}
47+
48+
/**
49+
* The address.
50+
*
51+
* @return the address as a property
52+
*/
53+
public Property<Address> addressProperty() {
54+
return address;
55+
}
56+
57+
// #region INNER CLASSES
58+
59+
/**
60+
* A simple demo class which represents an employee's address.
61+
*/
62+
public static class Address {
63+
64+
/**
65+
* The street name.
66+
*/
67+
private final StringProperty streetName;
68+
69+
/**
70+
* Creates a new address with the specified street name.
71+
*
72+
* @param streetName
73+
* the name of the street
74+
*/
75+
public Address(String streetName) {
76+
this.streetName = new SimpleStringProperty(this, "streetName", streetName);
77+
}
78+
79+
/**
80+
* The street name.
81+
*
82+
* @return the street name as a property
83+
*/
84+
public StringProperty streetNameProperty() {
85+
return streetName;
86+
}
87+
88+
}
89+
90+
//#end PRIVATE CLASSES
91+
92+
}

0 commit comments

Comments
 (0)