Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
88 commits
Select commit Hold shift + click to select a range
5f6eba8
Launching server does not add a new tab, making possible open and use…
mlxavier Apr 9, 2018
3685d24
Added association multiplicity range persistence support
mlxavier Apr 9, 2018
f0ebdd8
Code indentation to permit compare xml files with tools
mlxavier Apr 24, 2018
175f3f8
Fixed NullPointerException while saving model with relation without c…
mlxavier Apr 25, 2018
0fb266b
Partial implementation of detailed synchronization
mlxavier Apr 29, 2018
1aec3a8
Partial implementation of detailed synchronization
mlxavier Apr 30, 2018
427c0af
Partial implementation of detailed synchronization
mlxavier May 1, 2018
f828c2b
Partial implementation of detailed synchronization
mlxavier May 1, 2018
c233bf7
Partial implementation of detailed synchronization
mlxavier May 2, 2018
8b595b6
Partial implementation of detailed synchronization
mlxavier May 2, 2018
e985740
Partial implementation of detailed synchronization
mlxavier May 2, 2018
fc5cfcb
Partial implementation of detailed synchronization
mlxavier May 2, 2018
3f05985
Complete implementation of detailed synchronization
mlxavier May 2, 2018
7c54de1
Refactoring of implementation of detailed synchronization
mlxavier May 2, 2018
3218dd0
Refactoring of implementation of detailed synchronization
mlxavier May 3, 2018
4c52251
Refactoring of implementation of detailed synchronization
mlxavier May 3, 2018
734706d
Refactoring of implementation of detailed synchronization
mlxavier May 3, 2018
c317975
Refactoring of implementation of detailed synchronization
mlxavier May 3, 2018
0c9062b
Refactoring of implementation of detailed synchronization
mlxavier May 4, 2018
4c5be8d
Refactoring of implementation of detailed synchronization
mlxavier May 4, 2018
51721a9
Avoid generating new nodes ids each time a model is saved
mlxavier May 6, 2018
2c6bacd
Better log code for synchonization debug
mlxavier May 8, 2018
913b281
Better log code for synchonization debug
mlxavier May 8, 2018
048ce81
Update id of nodes and edges to uuid
mlxavier Aug 9, 2018
ca458a1
Remove old id node suffix
mlxavier Aug 9, 2018
68e5b6a
Added username support for colaboration
mlxavier Aug 10, 2018
713e601
Imporoving log
mlxavier Aug 10, 2018
5d256fe
Fix of log framwork
mlxavier Aug 14, 2018
c3f11a6
Added log for debug
mlxavier Aug 15, 2018
4810811
Split attributes and operations in synchronization
mlxavier Aug 15, 2018
4b7c072
Improve title
mlxavier Aug 15, 2018
5f065c1
Initial implementation of UMLCollab with class title
mlxavier Aug 16, 2018
0d7004b
Continuation of the implementation of UMLCollab with the class title,…
mlxavier Aug 17, 2018
3d6c076
Continuation of the implementation of UMLCollab with the class title.
mlxavier Aug 20, 2018
967b635
Continuation of the implementation of UMLCollab with the class title.
mlxavier Aug 21, 2018
362c3a7
Continuation of the implementation of UMLCollab with the class title.
mlxavier Aug 21, 2018
eb198a8
Continuation of the implementation of UMLCollab with the class title.
mlxavier Aug 23, 2018
2ae135b
Continuation of the implementation of UMLCollab with the class title.
mlxavier Aug 27, 2018
c28e7fd
Testing
mlxavier Aug 27, 2018
dc94d86
Continuation of the implementation of UMLCollab with the class attrib…
mlxavier Aug 28, 2018
85c5a0a
Continuation of the implementation of UMLCollab with the class attrib…
mlxavier Aug 28, 2018
d94a6eb
Continuation of the implementation of UMLCollab with the class attrib…
mlxavier Aug 28, 2018
8ef9bdf
Continuation of the implementation of UMLCollab with the class attrib…
mlxavier Aug 29, 2018
9935184
Continuation of the implementation of UMLCollab with the class attrib…
mlxavier Aug 29, 2018
cc81e37
Continuation of the implementation of UMLCollab with the class attrib…
mlxavier Aug 30, 2018
fecf9e2
Continuation of the implementation of UMLCollab with the class attrib…
mlxavier Aug 30, 2018
65d3512
Continuation of the implementation of UMLCollab with the class attrib…
mlxavier Aug 30, 2018
6554048
Continuation of the implementation of UMLCollab with the class attrib…
mlxavier Aug 30, 2018
d9c53d3
Continuation of the implementation of UMLCollab with the class attrib…
mlxavier Sep 3, 2018
2283546
Fix add new class transmit and changed word aprove to accept
mlxavier Sep 4, 2018
ba5b83e
Added partial support for Internationalization
mlxavier Sep 4, 2018
125dd2f
General fixes and improvements
mlxavier Sep 5, 2018
446ded8
General fixes and improvements
mlxavier Sep 6, 2018
b018a06
General fixes and improvements
mlxavier Sep 6, 2018
be48552
General fixes and improvements
mlxavier Sep 6, 2018
a2de353
General fixes and improvements
mlxavier Sep 7, 2018
4cc60d8
General fixes and improvements
mlxavier Sep 7, 2018
4fb7df0
Fix delete attribute and operation error
mlxavier Sep 10, 2018
373737e
Fix of remote removal of attributes and operations and improvements
mlxavier Sep 11, 2018
6a0922b
Fix of remote removal of attributes and operations and improvements
mlxavier Sep 12, 2018
f103b86
If remote change does not differ from local one, remove old conflicts…
mlxavier Sep 25, 2018
d938209
If remote change does not differ from local one, remove old conflicts…
mlxavier Sep 25, 2018
713812a
Deal with remote element name matchs local elemnent name
mlxavier Oct 11, 2018
2d332bc
Deal with remote element name matchs local elemnent name
mlxavier Oct 11, 2018
17e541a
Refinement of attributes and operations conflict handling
mlxavier Oct 14, 2018
0a4fb68
Refinement of attributes and operations conflict handling
mlxavier Oct 15, 2018
e71acc9
Refinement of attributes and operations conflict handling
mlxavier Oct 15, 2018
12b034b
Refinement of attributes and operations conflict handling
mlxavier Oct 15, 2018
a69bfbe
Added version
mlxavier Oct 17, 2018
24c7448
Added workaround for class delete in UMLCollab mode
mlxavier Oct 24, 2018
904b77c
getCollabotionType() and getUserName() are now dependent of selected tab
mlxavier Oct 26, 2018
44abe5d
Get model name from server and apply to client tab name
mlxavier Oct 26, 2018
abcc2dc
Refinement of attributes and operations conflict handling
mlxavier Nov 1, 2018
fceccac
Refinement of attributes and operations conflict handling
mlxavier Nov 1, 2018
b651df0
Deleting duplicate spaces in elements text
mlxavier Nov 4, 2018
9de4cc6
Deleting duplicate spaces in elements text
mlxavier Nov 5, 2018
3315cb7
Prompt text improvement for better visualization
mlxavier Nov 5, 2018
1f9c566
Fix spaces error in conflict detection
mlxavier Nov 8, 2018
fe773cf
Added changes not sented warning
mlxavier Nov 9, 2018
0d8d776
Added button to commit
mlxavier Nov 9, 2018
ecebb32
Fix error with move up/down and a duplicate attribute/operation
mlxavier Nov 26, 2018
3902a40
Fix error with move up/down and a duplicate attribute/operation
mlxavier Nov 26, 2018
38f1308
Fix error of merge indication removed
mlxavier Nov 26, 2018
99bc601
Improvements on commit messages
mlxavier Nov 27, 2018
43249c6
Added black version of commit icon
mlxavier Nov 27, 2018
fe0fcb6
Added black version of commit icon
mlxavier Nov 27, 2018
fd00a7c
Improve commit status
mlxavier Nov 28, 2018
5e86207
Added spanish translation
mlxavier Dec 10, 2018
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .classpath
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
<classpathentry kind="lib" path="lib/hamcrest-core-1.3.jar"/>
<classpathentry kind="lib" path="lib/Jama-1.0.2.jar"/>
<classpathentry kind="lib" path="lib/junit-4.12.jar"/>
<classpathentry kind="lib" path="lib/kryo-4.0.0.jar"/>
<classpathentry kind="lib" path="lib/kryo-4.0.2.jar"/>
<classpathentry kind="lib" path="lib/kryonet-2.21.jar"/>
<classpathentry kind="lib" path="lib/log4j-1.2.15.jar"/>
<classpathentry kind="lib" path="lib/minlog-1.3.0.jar"/>
Expand Down
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ hs_err_pid*
/JetUML-0.9/*
/JetUML-0.9/.idea/workspace.xml
*.iml
logging
*.log
.fuse*
META-INF

18 changes: 18 additions & 0 deletions conf/ladder.conf
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
# Where should the Ladder system look for the configuration file to configure
# the logging system?
loggingConfigFile = logging/ladderLoggingConfig.lcf

# What folder are any domain descriptions stored in?
domainDescriptions = ../LadderDomains/domainDescriptions/domains/

# What folder are the shape descriptions stored in?
shapeDescriptions = ../LadderDomains/domainDescriptions/shapes/

# What folder is testData stored in?
testData = ../LadderData/testData517

# This configuration property is the default domain to load
defaultLoadDomain = COA.xml

# What folder are the various models stored in?
modelDir = model
Binary file removed lib/kryo-4.0.0.jar
Binary file not shown.
Binary file added lib/kryo-4.0.2.jar
Binary file not shown.
230 changes: 230 additions & 0 deletions logging/ladderLoggingConfig.lcf
Original file line number Diff line number Diff line change
@@ -0,0 +1,230 @@
# The root category uses the appender called ROOT_APP. You can comment/uncomment
# a given line to change the default level of debugging for the entire
# application. For development, you probably want DEBUG. For Deployment, you
# probably don't want anything but ERROR by default. This can always be changed
# by editing this file if you need more/less, and you don't have to modify
# the logging code within the application itself.


###################### Root Logger
## For development
#log4j.rootCategory=DEBUG, ROOT_APP
## For deployment
log4j.rootCategory=ERROR, ROOT_APP


###################### ROOT_APP appender
# APP is set to be a RollingFileAppender which outputs to the file
# "ladder.log". If the file gets above a specified size limit, create a new
# log file, up to a certain number of log files.
log4j.appender.ROOT_APP=org.apache.log4j.RollingFileAppender
log4j.appender.ROOT_APP.File=logging/ladder.log
# 5MB log size limit
log4j.appender.ROOT_APP.MaxFileSize=5000KB
# just one other file, then start to recycle
log4j.appender.ROOT_APP.MaxBackupIndex=1
log4j.appender.ROOT_APP.layout=org.apache.log4j.PatternLayout
# Format to use when logging entries in the ROOT_APP log.
# See org.apache.log4j.PatternLayout for field details
# Date, priority, thread, logger location (SLOW), message, endline
log4j.appender.ROOT_APP.layout.ConversionPattern=%-35d{dd MMM yyyy, HH:mm:ss:SSS} %-5p [%t] %l -- %m%n


###################### Class Loggers
#Examples adding loggers for specific classes/packages
#
# Adding a logger to a class
# log4j.logger.<class name>=DEBUG, <appender 1>
#
# Multiple loggers
# log4j.logger.<class name>=DEBUG, <appender 1>, <appender 2>, ...
#
# Currently the available logs are:
# HIGH_LEVEL - For high level recognition
# LOW_LEVEL - For low level recognition
# SEGS - For segmentations
# CON - Console logging

# These go to both Console (short version) and to the Test file appender
log4j.logger.test.functional.ladder.recognition.constraint.domains.ShapeDefinitionAccuracyFactory=DEBUG, CONSHORT, TEST
log4j.logger.test.functional.ladder.recognition.constraint.domains.DomainDescriptionAccuracyTest=DEBUG, CONSHORT, TEST


log4j.logger.org.ladder.recognition.constraint.CALVIN=ERROR, HIGH_LEVEL, CON
log4j.logger.org.ladder.recognition.constraint.builders.ShapeBuilderTracy=ERROR, HIGH_LEVEL, CON
log4j.logger.org.ladder.recognition.constraint.grouping.PostMidLevelGrouper=ERROR, HIGH_LEVEL, CON
log4j.logger.org.ladder.recognition.paleo=ERROR, LOW_LEVEL, PALEO
log4j.logger.org.ladder.recognition.profiling.RunTimeLogger=DEBUG, RUNTIME
log4j.logger.org.ladder.segmentation=ERROR, LOW_LEVEL, SEGS

log4j.logger.org.ladder.recognition.constraint.domains.compiler.DomainDefinitionCompiler=WARN,CON
#log4j.logger.org.ladder.recognition.handwriting.HandwritingRecognizer=ERROR, CON
#log4j.logger.test.functional.ladder.recognition.constraint.domains=INFO, CON
#log4j.logger.test.functional.ladder.recognition.shapes.SingleShapeAccuracy=INFO, CON
log4j.logger.org.ladder.recognition.RecognitionManager=ERROR, CON
#log4j.logger.edu.tamu.deepGreen.recognition.area.AreaRecognizer=DEBUG, CON

## I want to see all the recognition package stuff on the console.
#log4j.logger.org.ladder.recognition=DEBUG, CON
## turn constraints off
#log4j.logger.org.ladder.recognition.constraint.confidence=OFF
#log4j.logger.org.ladder.recognition.constraint.ConstraintFactory=OFF
## turn paleo off, except for actual PaleoRecognizer
#log4j.logger.org.ladder.recognition.paleo=OFF
#log4j.logger.org.ladder.recognition.paleo.PaleoSketchRecognizer=DEBUG, CON
## COA TestPanel DEBUG and to the console
#log4j.logger.edu.tamu.deepGreen.test.COATestPanel=DEBUG, CON
#log4j.logger.edu.tamu.deepGreen.SIDCLookup=DEBUG, CON
#log4j.logger.test.ladder.recognition.constraint.domains.SingleExampleShapeAccuracyTest=INFO, CON

###################### LADDER appenders
# To create an appender, copy one of the ones below and replace the name and file name
# For example, copy HIGH_LEVEL, replace all instances of HIGH_LEVEL with the new name
# and change highLevel.log to the name for your log file


###################### CON appender
# CON is set to be a ConsoleAppender which outputs to the file
# "ladder.log". If the file gets above a specified size limit, create a new
# log file, up to a certain number of log files.
log4j.appender.CON=org.apache.log4j.ConsoleAppender
log4j.appender.CON.layout=org.apache.log4j.PatternLayout
# Format to use when logging entries in the CON log.
# See org.apache.log4j.PatternLayout for field details
# priority, thread, logger location (SLOW) -- message, endline
log4j.appender.CON.layout.ConversionPattern=%-5p [%t] %F.%M:%L -- %m%n



###################### CONSHORT appender
# CON is set to be a ConsoleAppender which outputs to the file
# "ladder.log". If the file gets above a specified size limit, create a new
# log file, up to a certain number of log files.
log4j.appender.CONSHORT=org.apache.log4j.ConsoleAppender
log4j.appender.CONSHORT.layout=org.apache.log4j.PatternLayout
# Format to use when logging entries in the CON log.
# See org.apache.log4j.PatternLayout for field details
# priority, thread, logger location (SLOW) -- message, endline
log4j.appender.CONSHORT.layout.ConversionPattern=%m%n


###################### HIGH_LEVEL appender
# HIGH_LEVEL is set to be a RollingFileAppender which outputs to the file
# "highLevel.log". If the file gets above a specified size limit, create a new
# log file, up to a certain number of log files.
log4j.appender.HIGH_LEVEL=org.apache.log4j.RollingFileAppender
log4j.appender.HIGH_LEVEL.File=logging/highLevel.log
# 5MB log size limit
log4j.appender.HIGH_LEVEL.MaxFileSize=5000KB
# just one other file, then start to recycle
log4j.appender.HIGH_LEVEL.MaxBackupIndex=1
log4j.appender.HIGH_LEVEL.layout=org.apache.log4j.PatternLayout
# Format to use when logging entries in the HIGH_LEVEL log.
# See org.apache.log4j.PatternLayout for field details
# Date, priority, thread, logger location (SLOW), message, endline
log4j.appender.HIGH_LEVEL.layout.ConversionPattern=%-35d{dd MMM yyyy, HH:mm:ss:SSS} %-5p [%t] %l -- %m%n%n

###################### LOW_LEVEL appender
# LOW_LEVEL is set to be a RollingFileAppender which outputs to the file
# "lowLevel.log". If the file gets above a specified size limit, create a new
# log file, up to a certain number of log files.
log4j.appender.LOW_LEVEL=org.apache.log4j.RollingFileAppender
log4j.appender.LOW_LEVEL.File=logging/lowLevel.log
# 5MB log size limit
log4j.appender.LOW_LEVEL.MaxFileSize=5000KB
# just one other file, then start to recycle
log4j.appender.LOW_LEVEL.MaxBackupIndex=1
log4j.appender.LOW_LEVEL.layout=org.apache.log4j.PatternLayout
# Format to use when logging entries in the LOW_LEVEL log.
# See org.apache.log4j.PatternLayout for field details
# Date, priority, thread, logger location (SLOW), message, endline
log4j.appender.LOW_LEVEL.layout.ConversionPattern=%-35d{dd MMM yyyy, HH:mm:ss:SSS} %-5p [%t] %l -- %m%n%n


###################### PALEO appender
# PALEO is set to be a RollingFileAppender which outputs to the file
# "paleo.log". If the file gets above a specified size limit, create a new
# log file, up to a certain number of log files.
log4j.appender.PALEO=org.apache.log4j.RollingFileAppender
log4j.appender.PALEO.File=logging/paleo.log
# 5MB log size limit
log4j.appender.PALEO.MaxFileSize=5000KB
# just one other file, then start to recycle
log4j.appender.PALEO.MaxBackupIndex=1
log4j.appender.PALEO.layout=org.apache.log4j.PatternLayout
# Format to use when logging entries in the PALEO log.
# See org.apache.log4j.PatternLayout for field details
# Date, priority, thread, logger location (SLOW), message, endline
log4j.appender.PALEO.layout.ConversionPattern=%-35d{dd MMM yyyy, HH:mm:ss:SSS} %-5p [%t] %l -- %m%n%n


###################### SEGS appender
# SEGS is set to be a RollingFileAppender which outputs to the file
# "segs.log". If the file gets above a specified size limit, create a new
# log file, up to a certain number of log files.
log4j.appender.SEGS=org.apache.log4j.RollingFileAppender
log4j.appender.SEGS.File=logging/segmentation.log
# 5MB log size limit
log4j.appender.SEGS.MaxFileSize=5000KB
# just one other file, then start to recycle
log4j.appender.SEGS.MaxBackupIndex=1
log4j.appender.SEGS.layout=org.apache.log4j.PatternLayout
# Format to use when logging entries in the SEGS log.
# See org.apache.log4j.PatternLayout for field details
# Date, priority, thread, logger location (SLOW), message, endline
log4j.appender.SEGS.layout.ConversionPattern=%-35d{dd MMM yyyy, HH:mm:ss:SSS} %-5p [%t] %l -- %m%n%n


###################### CONSTR appender
# CONSTR is set to be a RollingFileAppender which outputs to the file
# "constraint.log". If the file gets above a specified size limit, create a new
# log file, up to a certain number of log files.
log4j.appender.CONSTR=org.apache.log4j.RollingFileAppender
log4j.appender.CONSTR.File=logging/constraint.log
# 5MB log size limit
log4j.appender.CONSTR.MaxFileSize=5000KB
# just one other file, then start to recycle
log4j.appender.CONSTR.MaxBackupIndex=1
log4j.appender.CONSTR.layout=org.apache.log4j.PatternLayout
# Format to use when logging entries in the SEGS log.
# See org.apache.log4j.PatternLayout for field details
# Date, priority, thread, logger location (SLOW), message, endline
log4j.appender.CONSTR.layout.ConversionPattern=%-35d{dd MMM yyyy, HH:mm:ss:SSS} %-5p [%t] %l -- %m%n%n

###################### RUNTIME appender
# RUNTIME is set to be a RollingFileAppender which outputs to the file
# "runtime.log". If the file gets above a specified size limit, create a new
# log file, up to a certain number of log files.
log4j.appender.RUNTIME=org.apache.log4j.RollingFileAppender
log4j.appender.RUNTIME.File=logging/runtime.log
# 5MB log size limit
log4j.appender.RUNTIME.MaxFileSize=5000KB
# just one other file, then start to recycle
log4j.appender.RUNTIME.MaxBackupIndex=1
log4j.appender.RUNTIME.layout=org.apache.log4j.PatternLayout
# Format to use when logging entries in the SEGS log.
# See org.apache.log4j.PatternLayout for field details
# Date, priority, thread, logger location (SLOW), message, endline
log4j.appender.RUNTIME.layout.ConversionPattern=%-5p [%t]: %m%n

###################### TEST appender
# TEST is set to be a FileAppender which outputs to the file
# "test.log". The logger does NOT append, but overwrites with a new file each
# time
log4j.appender.TEST=org.apache.log4j.FileAppender
# Do not append, start a new file each time
log4j.appender.TEST.append=false
log4j.appender.TEST.File=logging/test.log
log4j.appender.TEST.layout=org.apache.log4j.PatternLayout
# Format to use when logging entries in the TEST log.
# See org.apache.log4j.PatternLayout for field details
# Date, priority, thread, logger location (SLOW), message, endline
log4j.appender.TEST.layout.ConversionPattern=%m%n



# We can create different appenders and files for different parts of LADDER.
# These loggers will log their information in their local appenders, PLUS all
# that information will also be present in the root logger. But, these
# sub-loggers can have different priorities, etc.
# For example, here's a logger for objects in org.ladder.core
Loading