Skip to content

Commit

Permalink
FlatLaf library update;
Browse files Browse the repository at this point in the history
Bugfix: create, move and duplicate of draw pages not working when move
tool is selectec.
  • Loading branch information
davidbuzatto committed Mar 16, 2021
1 parent 206f328 commit 2a5aba8
Show file tree
Hide file tree
Showing 7 changed files with 150 additions and 142 deletions.
24 changes: 12 additions & 12 deletions TODO.txt
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
Release Planning
v1.5
Undo and Redo for each draw page
Undo/Redo clear current draw page: under development
Undo/Redo move current draw page: under development
Undo/Redo new draw page: under development
Undo/Redo duplicate current draw page: under development

v1.5.1

v1.6
Shape resize
Shape rotation

v1.7
Selection Tool
Duplicate selected shapes
Alignment Tools

v1.5.2
Shape resize
Shape rotation

v1.?
Undo/Redo clear current draw page
Undo/Redo move current draw page
Undo/Redo new draw page
Undo/Redo duplicate current draw page
Binary file removed lib/FlatLaf-0.40/flatlaf-0.40.jar
Binary file not shown.
Binary file added lib/FlatLaf-1.0/flatlaf-1.0.jar
Binary file not shown.
20 changes: 10 additions & 10 deletions lib/nblibraries.properties
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
libs.CopyLibs.classpath=\
${base}/CopyLibs/org-netbeans-modules-java-j2seproject-copylibstask.jar
libs.CopyLibs.displayName=CopyLibs Task
libs.CopyLibs.prop-version=3.0
libs.FlatLaf-0.40.classpath=\
${base}/FlatLaf-0.40/flatlaf-0.40.jar
libs.FlatLaf-0.40.displayName=FlatLaf-0.40
libs.JTS_1.13.classpath=\
${base}/JTS_1.13/jts-1.13.jar
libs.JTS_1.13.displayName=JTS 1.13
libs.CopyLibs.classpath=\
${base}/CopyLibs/org-netbeans-modules-java-j2seproject-copylibstask.jar
libs.CopyLibs.displayName=CopyLibs Task
libs.CopyLibs.prop-version=3.0
libs.FlatLaf-1.0.classpath=\
${base}/FlatLaf-1.0/flatlaf-1.0.jar
libs.FlatLaf-1.0.displayName=FlatLaf-1.0
libs.JTS_1.13.classpath=\
${base}/JTS_1.13/jts-1.13.jar
libs.JTS_1.13.displayName=JTS 1.13
226 changes: 113 additions & 113 deletions nbproject/project.properties
Original file line number Diff line number Diff line change
@@ -1,113 +1,113 @@
annotation.processing.enabled=true
annotation.processing.enabled.in.editor=false
annotation.processing.processors.list=
annotation.processing.run.all.processors=true
annotation.processing.source.output=${build.generated.sources.dir}/ap-source-output
application.title=ComputerSupportedClassHelper
application.vendor=David Buzatto
auxiliary.org-netbeans-spi-editor-hints-projects.perProjectHintSettingsFile=nbproject/cfg_hints.xml
build.classes.dir=${build.dir}/classes
build.classes.excludes=**/*.java,**/*.form
# This directory is removed when the project is cleaned:
build.dir=build
build.generated.dir=${build.dir}/generated
build.generated.sources.dir=${build.dir}/generated-sources
# Only compile against the classpath explicitly listed here:
build.sysclasspath=ignore
build.test.classes.dir=${build.dir}/test/classes
build.test.results.dir=${build.dir}/test/results
# Uncomment to specify the preferred debugger connection transport:
#debug.transport=dt_socket
debug.classpath=\
${run.classpath}
debug.modulepath=\
${run.modulepath}
debug.test.classpath=\
${run.test.classpath}
debug.test.modulepath=\
${run.test.modulepath}
# Files in build.classes.dir which should be excluded from distribution jar
dist.archive.excludes=
# This directory is removed when the project is cleaned:
dist.dir=dist
dist.jar=${dist.dir}/ComputerSupportedClassHelper.jar
dist.javadoc.dir=${dist.dir}/javadoc
endorsed.classpath=
excludes=
includes=**
jar.archive.disabled=${jnlp.enabled}
jar.compress=false
jar.index=${jnlp.enabled}
javac.classpath=\
${libs.JTS_1.13.classpath}:\
${libs.FlatLaf-0.40.classpath}
# Space-separated list of extra javac options
javac.compilerargs=
javac.deprecation=false
javac.external.vm=true
javac.modulepath=
javac.processormodulepath=
javac.processorpath=\
${javac.classpath}
javac.source=1.8
javac.target=1.8
javac.test.classpath=\
${javac.classpath}:\
${build.classes.dir}
javac.test.modulepath=\
${javac.modulepath}
javac.test.processorpath=\
${javac.test.classpath}
javadoc.additionalparam=
javadoc.author=false
javadoc.encoding=${source.encoding}
javadoc.html5=false
javadoc.noindex=false
javadoc.nonavbar=false
javadoc.notree=false
javadoc.private=false
javadoc.splitindex=true
javadoc.use=true
javadoc.version=false
javadoc.windowtitle=
jlink.launcher=false
jlink.launcher.name=ComputerSupportedClassHelper
jnlp.codebase.type=no.codebase
jnlp.descriptor=application
jnlp.enabled=false
jnlp.mixed.code=default
jnlp.offline-allowed=false
jnlp.signed=false
jnlp.signing=
jnlp.signing.alias=
jnlp.signing.keystore=
main.class=br.com.davidbuzatto.computersupportedclasshelper.Main
# Optional override of default Application-Library-Allowable-Codebase attribute identifying the locations where your signed RIA is expected to be found.
manifest.custom.application.library.allowable.codebase=
# Optional override of default Caller-Allowable-Codebase attribute identifying the domains from which JavaScript code can make calls to your RIA without security prompts.
manifest.custom.caller.allowable.codebase=
# Optional override of default Codebase manifest attribute, use to prevent RIAs from being repurposed
manifest.custom.codebase=
# Optional override of default Permissions manifest attribute (supported values: sandbox, all-permissions)
manifest.custom.permissions=
manifest.file=manifest.mf
meta.inf.dir=${src.dir}/META-INF
mkdist.disabled=false
platform.active=default_platform
run.classpath=\
${javac.classpath}:\
${build.classes.dir}
# Space-separated list of JVM arguments used when running the project.
# You may also define separate properties like run-sys-prop.name=value instead of -Dname=value.
# To set system properties for unit tests define test-sys-prop.name=value:
run.jvmargs=
run.modulepath=\
${javac.modulepath}
run.test.classpath=\
${javac.test.classpath}:\
${build.test.classes.dir}
run.test.modulepath=\
${javac.test.modulepath}
source.encoding=UTF-8
src.dir=src
test.src.dir=test
annotation.processing.enabled=true
annotation.processing.enabled.in.editor=false
annotation.processing.processors.list=
annotation.processing.run.all.processors=true
annotation.processing.source.output=${build.generated.sources.dir}/ap-source-output
application.title=ComputerSupportedClassHelper
application.vendor=David Buzatto
auxiliary.org-netbeans-spi-editor-hints-projects.perProjectHintSettingsFile=nbproject/cfg_hints.xml
build.classes.dir=${build.dir}/classes
build.classes.excludes=**/*.java,**/*.form
# This directory is removed when the project is cleaned:
build.dir=build
build.generated.dir=${build.dir}/generated
build.generated.sources.dir=${build.dir}/generated-sources
# Only compile against the classpath explicitly listed here:
build.sysclasspath=ignore
build.test.classes.dir=${build.dir}/test/classes
build.test.results.dir=${build.dir}/test/results
# Uncomment to specify the preferred debugger connection transport:
#debug.transport=dt_socket
debug.classpath=\
${run.classpath}
debug.modulepath=\
${run.modulepath}
debug.test.classpath=\
${run.test.classpath}
debug.test.modulepath=\
${run.test.modulepath}
# Files in build.classes.dir which should be excluded from distribution jar
dist.archive.excludes=
# This directory is removed when the project is cleaned:
dist.dir=dist
dist.jar=${dist.dir}/ComputerSupportedClassHelper.jar
dist.javadoc.dir=${dist.dir}/javadoc
endorsed.classpath=
excludes=
includes=**
jar.archive.disabled=${jnlp.enabled}
jar.compress=false
jar.index=${jnlp.enabled}
javac.classpath=\
${libs.JTS_1.13.classpath}:\
${libs.FlatLaf-1.0.classpath}
# Space-separated list of extra javac options
javac.compilerargs=
javac.deprecation=false
javac.external.vm=true
javac.modulepath=
javac.processormodulepath=
javac.processorpath=\
${javac.classpath}
javac.source=1.8
javac.target=1.8
javac.test.classpath=\
${javac.classpath}:\
${build.classes.dir}
javac.test.modulepath=\
${javac.modulepath}
javac.test.processorpath=\
${javac.test.classpath}
javadoc.additionalparam=
javadoc.author=false
javadoc.encoding=${source.encoding}
javadoc.html5=false
javadoc.noindex=false
javadoc.nonavbar=false
javadoc.notree=false
javadoc.private=false
javadoc.splitindex=true
javadoc.use=true
javadoc.version=false
javadoc.windowtitle=
jlink.launcher=false
jlink.launcher.name=ComputerSupportedClassHelper
jnlp.codebase.type=no.codebase
jnlp.descriptor=application
jnlp.enabled=false
jnlp.mixed.code=default
jnlp.offline-allowed=false
jnlp.signed=false
jnlp.signing=
jnlp.signing.alias=
jnlp.signing.keystore=
main.class=br.com.davidbuzatto.computersupportedclasshelper.Main
# Optional override of default Application-Library-Allowable-Codebase attribute identifying the locations where your signed RIA is expected to be found.
manifest.custom.application.library.allowable.codebase=
# Optional override of default Caller-Allowable-Codebase attribute identifying the domains from which JavaScript code can make calls to your RIA without security prompts.
manifest.custom.caller.allowable.codebase=
# Optional override of default Codebase manifest attribute, use to prevent RIAs from being repurposed
manifest.custom.codebase=
# Optional override of default Permissions manifest attribute (supported values: sandbox, all-permissions)
manifest.custom.permissions=
manifest.file=manifest.mf
meta.inf.dir=${src.dir}/META-INF
mkdist.disabled=false
platform.active=default_platform
run.classpath=\
${javac.classpath}:\
${build.classes.dir}
# Space-separated list of JVM arguments used when running the project.
# You may also define separate properties like run-sys-prop.name=value instead of -Dname=value.
# To set system properties for unit tests define test-sys-prop.name=value:
run.jvmargs=
run.modulepath=\
${javac.modulepath}
run.test.classpath=\
${javac.test.classpath}:\
${build.test.classes.dir}
run.test.modulepath=\
${javac.test.modulepath}
source.encoding=UTF-8
src.dir=src
test.src.dir=test
Original file line number Diff line number Diff line change
Expand Up @@ -2717,7 +2717,8 @@ public boolean dispatchKeyEvent( KeyEvent e ) {
break;

case KeyEvent.VK_RIGHT:
if ( !btnMove.isSelected() && selectedShape == null ) {
//if ( !btnMove.isSelected() && selectedShape == null ) {
if ( selectedShape == null ) {
if ( CustomMessageAndConfirmDialog.showConfirmDialog(
mainFrame,
"<html>Duplicate the current draw page to the right?</html>", "Duplicate Current Draw Page" ) == JOptionPane.YES_OPTION ) {
Expand All @@ -2729,7 +2730,8 @@ public boolean dispatchKeyEvent( KeyEvent e ) {
break;

case KeyEvent.VK_LEFT:
if ( !btnMove.isSelected() && selectedShape == null ) {
//if ( !btnMove.isSelected() && selectedShape == null ) {
if ( selectedShape == null ) {
if ( CustomMessageAndConfirmDialog.showConfirmDialog(
mainFrame,
"<html>Duplicate the current draw page to the left?</html>", "Duplicate Current Draw Page" ) == JOptionPane.YES_OPTION ) {
Expand Down Expand Up @@ -2844,7 +2846,8 @@ public boolean dispatchKeyEvent( KeyEvent e ) {

case KeyEvent.VK_UP:

if ( !btnMove.isSelected() && selectedShape == null ) {
//if ( !btnMove.isSelected() && selectedShape == null ) {
if ( selectedShape == null ) {

if ( CustomMessageAndConfirmDialog.showConfirmDialog(
mainFrame,
Expand Down Expand Up @@ -2874,7 +2877,8 @@ public boolean dispatchKeyEvent( KeyEvent e ) {

case KeyEvent.VK_RIGHT:

if ( !btnMove.isSelected() && selectedShape == null ) {
//if ( !btnMove.isSelected() && selectedShape == null ) {
if ( selectedShape == null ) {

if ( drawPanel.willCreateNewEndDrawPage() ) {
if ( CustomMessageAndConfirmDialog.showConfirmDialog(
Expand Down Expand Up @@ -2916,7 +2920,8 @@ public boolean dispatchKeyEvent( KeyEvent e ) {

case KeyEvent.VK_LEFT:

if ( !btnMove.isSelected() && selectedShape == null ) {
//if ( !btnMove.isSelected() && selectedShape == null ) {
if ( selectedShape == null ) {

if ( drawPanel.willCreateNewStartDrawPage() ) {
if ( CustomMessageAndConfirmDialog.showConfirmDialog(
Expand Down Expand Up @@ -3142,13 +3147,13 @@ public boolean dispatchKeyEvent( KeyEvent e ) {

case KeyEvent.VK_UP:
if ( btnMove.isSelected() && selectedShape != null ) {
selectedShape.setScale( selectedShape.getScale() + 0.01 );
selectedShape.setScale( selectedShape.getScale() + 0.005 );
}
break;

case KeyEvent.VK_DOWN:
if ( btnMove.isSelected() && selectedShape != null ) {
selectedShape.setScale( selectedShape.getScale() - 0.01 );
selectedShape.setScale( selectedShape.getScale() - 0.005 );
}
break;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -232,6 +232,9 @@ protected static void copyData( Shape origin, Shape target ) {
target.xEndD = origin.xEndD;
target.yEndD = origin.yEndD;

target.scale = origin.scale;
target.angle = origin.angle;

target.strokeColor = origin.strokeColor;
target.fillColor = origin.fillColor;
target.strokeWidth = origin.strokeWidth;
Expand Down

0 comments on commit 2a5aba8

Please sign in to comment.