Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
* Serialization of Enumeration Literals (#11) * Included complete OntoUML stereotype list and improved JSON serialization (#9) * All Steryotypes removed and OntoUML steryotypes added on plugin start, remove all UML steryotypes both type class and association and install OntoUML stereotypes. * Fixed package name. * buttons for load/unload ontoUML stereotypes * improve the activation of the default stereotypes when activate the default stereotype, removed the stereotypes that are already in the classes. * [WIP] print json schema for all elements in project. Still missing some features. added testModel.vpp to the vpp projects folder * added support for association and other types * Testing commit * [wip] added uri to the elements * Ongoing integration * Functional remote verification Non-blocking, logged, remote verification. Requires refactoring. * Minor improvements Bug-fixes and refactoring * Minor fixes * Improved generation and error display on LOG Transformation shall be updated to workaround limitations of GSON's serialization and improvements on OntoUML Schema. * Changing Stereotypes with Right Click * Experimenting with default color profiles * Fixing GSON issue and ClassCastException * Updating stereotypes * Setting up configurations menu * Configurations Menu * General improvements * General refactoring and bugfix * General refactoring and bugfix #2 * Major Refactoring and Documentation Classes yet to be refactored/documented: - ActivateOntoUMLPlugin - ActivateDefaultStereotypes - StereotypeUtils - CollectionAdapter - Most classes within package it.unibz.inf.ontouml.vp.model * Model Export feature and refactoring * Auto-coloring feature and icons update * Minor improvements to auto-coloring It now affects all views of the selected model element. * Maven project (#7) * maven project * removed readme * openapi.jar was added to the project folder in order to be executed out of the box using maven compile. * changed folder name lib to repo / changed compiler to java 11 in pom.xml * gitignore updated * solved identation in git ignore file * Revert "Merge branch 'development' into maven-project" This reverts commit a72c78c, reversing changes made to 1cd30e4. * Update .gitignore * Delete openapi.jar * Update .gitignore * Removed unused imports * Update .gitignore * Including debug dependencies * Cleaning POM file * added generation of zip file of the plugin * Update README and .gitignore Co-authored-by: Tiago Prince Sales <tgoprince@users.noreply.github.com> Co-authored-by: Claudenir Morais Fonseca <claudenirmf@gmail.com> * removed toolbar buttons and removed some options in configurations panel. * cardinality updated * removed comment * Removed XML Export Window. * removed if to test if model verification is enabled * fixed url server verification * Fixed string regex in AssociationEnd * set timeout for 60s in request verification * added some logs in verification and also added behavior to check if custom server is enabled before mounting the URL. * Added all stereotypes * Stereotype order * Update stereotype serialization * Removed unused import * Coloring enabled by default * Update Stereotypes.java * updated associationEnd and Attribute cardinalities * change aggregationkind when applying stereotypes and set abstract to true when aplying mixin stereotype to classes * [WIP] - implementing new schema * wip - corrections in model creation to adapt to the new schema * remove propertyAssignment class. * created reference class * fixes * fix * Some updates Ongoing changes * added propertyAssignment build * wip - added property assignment to reflect better tagged values, add DataType class as well. * isDerived logic * Removed <<historical>> stereotype. <<historicalDependence>> should be used instead. * Update .gitignore * Removed Stereotypes.java This class only responsibility was to add the prefix ontouml/2 or vp/custom to stereotypes on the serialization. We decided not to have this prefixes on the exchanged models anymore. * Update ModelExportAction.java * Removed Reload plugin button * Bugfix null pointer on Association and Property constructors * removed datatype class and included datatype constructor in class class. Removed AssociationEnd and Attribute classes because it will be handled by Property class. * fixed associationclass * propertyAssignments in all elements * fixed setName and isDerived * fixed property assignments for association end * added some comments * id was not being set in Package Element * added description field to the elements * if description is empty set attribut to null * fixed Reference in Generalization constructor * fixed reference in GeneralizationSet * fixed tagged values when model element is not specified * ready to be merged * Improvements from code review * Removed duplicated code and fixed transformation of missing propertyType * Missing refactoring from tagged value extraction * Update Class.java Co-authored-by: Claudenir Morais Fonseca <claudenirmf@gmail.com> Co-authored-by: Tiago Prince Sales <tgoprince@users.noreply.github.com> * added Literal class for enumeration serialization Co-authored-by: Viola <victorviola86@gmail.com> Co-authored-by: Claudenir Morais Fonseca <claudenirmf@gmail.com> * Hotfix: Null pointer exception on Class constructor (#13) * fixed constructor - checked this.stereotypes for null before using. * Update Class.java Co-authored-by: Tiago Prince Sales <tgoprince@users.noreply.github.com> * Serialization improvements on propertyAssignments and Generalization and GUI improvement on Model Export (#12) * Included complete OntoUML stereotype list and improved JSON serialization (#9) * All Steryotypes removed and OntoUML steryotypes added on plugin start, remove all UML steryotypes both type class and association and install OntoUML stereotypes. * Fixed package name. * buttons for load/unload ontoUML stereotypes * improve the activation of the default stereotypes when activate the default stereotype, removed the stereotypes that are already in the classes. * [WIP] print json schema for all elements in project. Still missing some features. added testModel.vpp to the vpp projects folder * added support for association and other types * Testing commit * [wip] added uri to the elements * Ongoing integration * Functional remote verification Non-blocking, logged, remote verification. Requires refactoring. * Minor improvements Bug-fixes and refactoring * Minor fixes * Improved generation and error display on LOG Transformation shall be updated to workaround limitations of GSON's serialization and improvements on OntoUML Schema. * Changing Stereotypes with Right Click * Experimenting with default color profiles * Fixing GSON issue and ClassCastException * Updating stereotypes * Setting up configurations menu * Configurations Menu * General improvements * General refactoring and bugfix * General refactoring and bugfix #2 * Major Refactoring and Documentation Classes yet to be refactored/documented: - ActivateOntoUMLPlugin - ActivateDefaultStereotypes - StereotypeUtils - CollectionAdapter - Most classes within package it.unibz.inf.ontouml.vp.model * Model Export feature and refactoring * Auto-coloring feature and icons update * Minor improvements to auto-coloring It now affects all views of the selected model element. * Maven project (#7) * maven project * removed readme * openapi.jar was added to the project folder in order to be executed out of the box using maven compile. * changed folder name lib to repo / changed compiler to java 11 in pom.xml * gitignore updated * solved identation in git ignore file * Revert "Merge branch 'development' into maven-project" This reverts commit a72c78c, reversing changes made to 1cd30e4. * Update .gitignore * Delete openapi.jar * Update .gitignore * Removed unused imports * Update .gitignore * Including debug dependencies * Cleaning POM file * added generation of zip file of the plugin * Update README and .gitignore Co-authored-by: Tiago Prince Sales <tgoprince@users.noreply.github.com> Co-authored-by: Claudenir Morais Fonseca <claudenirmf@gmail.com> * removed toolbar buttons and removed some options in configurations panel. * cardinality updated * removed comment * Removed XML Export Window. * removed if to test if model verification is enabled * fixed url server verification * Fixed string regex in AssociationEnd * set timeout for 60s in request verification * added some logs in verification and also added behavior to check if custom server is enabled before mounting the URL. * Added all stereotypes * Stereotype order * Update stereotype serialization * Removed unused import * Coloring enabled by default * Update Stereotypes.java * updated associationEnd and Attribute cardinalities * change aggregationkind when applying stereotypes and set abstract to true when aplying mixin stereotype to classes * [WIP] - implementing new schema * wip - corrections in model creation to adapt to the new schema * remove propertyAssignment class. * created reference class * fixes * fix * Some updates Ongoing changes * added propertyAssignment build * wip - added property assignment to reflect better tagged values, add DataType class as well. * isDerived logic * Removed <<historical>> stereotype. <<historicalDependence>> should be used instead. * Update .gitignore * Removed Stereotypes.java This class only responsibility was to add the prefix ontouml/2 or vp/custom to stereotypes on the serialization. We decided not to have this prefixes on the exchanged models anymore. * Update ModelExportAction.java * Removed Reload plugin button * Bugfix null pointer on Association and Property constructors * removed datatype class and included datatype constructor in class class. Removed AssociationEnd and Attribute classes because it will be handled by Property class. * fixed associationclass * propertyAssignments in all elements * fixed setName and isDerived * fixed property assignments for association end * added some comments * id was not being set in Package Element * added description field to the elements * if description is empty set attribut to null * fixed Reference in Generalization constructor * fixed reference in GeneralizationSet * fixed tagged values when model element is not specified * ready to be merged * Improvements from code review * Removed duplicated code and fixed transformation of missing propertyType * Missing refactoring from tagged value extraction * Update Class.java Co-authored-by: Claudenir Morais Fonseca <claudenirmf@gmail.com> Co-authored-by: Tiago Prince Sales <tgoprince@users.noreply.github.com> * added new file dialog to export model. Also suggets filename. * if no property assignment added - return null * if a Generalization has stereotypes in both ends does not add this generalization to the model. * export json Changed view to File Dialog Now suggests the same name of the last save * Quick fix on name suggestion * Removed unused semicolon * Only serializes generalizations between classes or associations * Update ModelElement.java Co-authored-by: Claudenir Morais Fonseca <claudenirmf@gmail.com> Co-authored-by: Tiago Prince Sales <tgoprince@users.noreply.github.com> * Hotfix: Null pointer exception when reading outdate config file (#14) * Bugfix * Remove unnecessary sysout call Co-authored-by: Claudenir Morais Fonseca <claudenirmf@gmail.com> * Feature to disable associations dynamically (#15) * added feature to disable associations dynamically * Bugfix when applying <<mode>>, <<quality>>, <<relator>> and <<manifestation>> * added missing source stereotype (Quality) * Update ApplyStereotype.java * Fixed category case when setting the possible relations * changed types do HashMap * removed powertype from the association stereotypes list and also removed some unused imports * implementation changed to use a single map with all constraints. * removed unused imports * Update AssociationConstraints.java * Minor improvements Co-authored-by: Tiago Prince Sales <tgoprince@users.noreply.github.com> Co-authored-by: Claudenir Morais Fonseca <claudenirmf@gmail.com> * [WIP] Listeners and basic coloring. * [WIP] coloring all model * [WIP] Smart Coloring fixes * fix in smart paint * fixed unused code * paint diagram button improved listeners * if auto coloring disabled do not paint * WIP added listeners when load the plugin. Still need to evaluate where the listeners should be. * fixed mixins coloring * fixed coloring to match mixin pattern * fixed subkinds in a row * Small fixes * Avoids repeating code * Renamed COLOR_NON_SORTAL to COLOR_UNKNOWN * fixes and removed unused code * added smartpaint in applystereotype It is been hard to deal with stereotype listener * removed unused listeners * Removed println() that I commited by mistake * Update SmartColoring.java * Menubar Icon update * working for generalization changes * Update OntoUML server URL * removed unused imports * Added a warning when the user clicks on smart paint and the auto coloring is set to false. * fixed null pointer exception when removing generalization. * Fixed NullPointerException when serializing generalizations * Bugfix on my previous fix ;) * added dialog box when user clicks in smart paint * Updates Smart Paint actions and removes unused imports * Updates listeners, improves readability and prevents exceptions * todo's removed. * Quick systout fix * Syntax verification (#17) * verification response warning dialog and messages in log panel * improved log messages and created function to get icon path. * Minor fixes * Adds verification dialog method * some http response handled and added some try/catch * Updates dialogs in case of failure Co-authored-by: Claudenir Morais Fonseca <claudenirmf@gmail.com> * Connects plugin to the server for model transformation to gUFO (#18) * Initial commit * Connects to the server * Minor issues * addded verification for custom server in transformation to gufo also adapted verification function url building. * added option to retry export to gUFO using the default server. * added option to retry in verification service if service custom has problems * Adds protection to Server Not Found Co-authored-by: Viola <victorviola86@gmail.com> * Smart meta properties feature (#27) * set meta-properties whole model * bug fixed when applying stereotypes for associations. * set cardinalities if null or unspecified. * update smartproperties.java to avoid duplicated code. * set readonly only where it is true. * fixed bug in cardinality setting. * Fixed cardinality value on <<termination>> * renamed smartProperties to SmartModelling. Moved functions from ApplyStereotype to SmartModelling class. Removed set meta properties from listeners and added to the class ApplyStereotype. * Bugfix: HistoricalDependence * Group all "smart modeling" features together Plus: 1. Material relations are 1..* by defaul only when relating roles. 2. subQuantityOf is, by default, readOnly=true on the part end * Removed unused imports * Created function to set default meta properties also for classes * Cleaned up SmartModeling.java Co-authored-by: Victor Viola <victor.viola@farfetch.com> Co-authored-by: Tiago Prince Sales <tiago.princesales@unibz.it> * Disable stereotypes as you model (#28) Implement the features described in issues #23 and #26 * disabling stereotypes as you model. * removed unecessary comments * added option in configurations to enable/disable smart modelling * Fixed allowed supertypes of Subkind * Subkinds cannot specialize Types * fix in setting allowed stereotypes in generalizations * fixed layout for configurations panel. * Fixed null pointer when subtype or super type did not have stereotypes * Enabling/disabling smart modeling applies to associations and classes * Toggling smart modeling also impacts association default metaproperties Co-authored-by: Victor Viola <victor.viola@farfetch.com> Co-authored-by: Tiago Prince Sales <tiago.princesales@unibz.it> * diagram verification * added user logs to distinct between diagram/model verification. Also added protection to runs the diagram verification only if there is a class diagram opened. * Adjusted messages display in dialogs displayed after verification is called * Small improvements to the message log * New Log Panel and highlight elements after verification. * improved textArea in log panel. Now user cannot edit the text. * open specification option in context menu / disable take me there if class is not in any diagram * border between results in log panel * Updates ViewUtils * Updates ViewUtils * changed log panel to use JList. * Updates ViewUtils * Apply stereotype feature works when multiple classes are selected (#39) * apply multiple sterotypes at same time. Only works if all elements in the selection are the same. * if selection has classes and associations selected at the same time validate rule for only the object that had the click. * apply same stereotype for all elements selected * fix update stereotype when selection multiple objects. * when user selects more than one object do not apply constraints * added new Fixed menu - now suggests stereotypes only when 1 class is selected or all selected classes have the same super class. * fixed action behavior in context menu of the model explorer * fixed context menu when selecting stereotypes from model explorer Co-authored-by: Victor Viola <victor.viola@farfetch.com> * Issue31 add progress bar (#44) * apply multiple sterotypes at same time. Only works if all elements in the selection are the same. * if selection has classes and associations selected at the same time validate rule for only the object that had the click. * apply same stereotype for all elements selected * fix update stereotype when selection multiple objects. * when user selects more than one object do not apply constraints * added new Fixed menu - now suggests stereotypes only when 1 class is selected or all selected classes have the same super class. * fixed action behavior in context menu of the model explorer * fixed context menu when selecting stereotypes from model explorer * progressBar first version * progress bar when calling diagram verification * progresspanel - WIP * fixes - wip * progresbar with threads. Now user can cancel the request. * fixed bug in case of exception or response null * added message when user cancel the request. * added progress bar to export to json after user selects the filename and file directory * first close the progess bar then show the dialog * added progress bar when exporting to gufo * removed duplcated code. * bug fixed when selecting an invalid endpoint * bug fixed when handling model verification response * added progress dialog to the functions that connects to the server. Improved the way the progress dialog works. * improved in how the loading box closes. * Fixed null pointer when canceling the model export Co-authored-by: Victor Viola <victor.viola@farfetch.com> Co-authored-by: Tiago Prince Sales <tiago.princesales@unibz.it> * Made project compliant to Maven's default folder structure * Fixes on pom.xml * Executing VP with plugin through Maven * Added maven wrapper * Skip installation of plugin on local maven directory * Updates scripts * Improved README.md * Cleaned up run.sh * Added build profiles to distinguish exec scripts * added .bat script to mvn exec in windows * Fixed unix run-vp script * improved bat script * Update README.md * added version label in settings panel (#48) * Added support for OntoUML tagged values(#37) * Adds proper generation of stereotypes * Updates apply stereotypes and serialization * Working on tagged value overwrite * Bug fix * Updates class serialization * Fix tagged value update * Refactor methods * Bugfix apply fixed menu * Updates context menus for properties * Updates properties menus * Updated set order dialog * Includes abstract nature * Updates JSON serialization * Bugfix * BugFix * Additional options added to the contextual menus * Removes local maven variables from repo * Updates Meta-Properties context menu * Updates enabling of meta-properties context menu Co-authored-by: Tiago Prince Sales <tiago.princesales@unibz.it> * Bugfix duplicated tagged values * New UI to access the ontouml2gufo service (#49) * WIP - checkbox tree for diagrams and model * added dynamic icons to the tree * improved icon setting. * wip - added option to choose between trees * Save user config when exporting to GUFO * wip - selection tree - retrieving nodes * fixed window control * created new constructors. * fix bug when calling class constructor * added comments and removed others. * Moved icons * wip - package tree explorer * now models and packages have priority in the package tree. * added new model elements to package tree * added option to check class without checking attributes * fix attribute selection * check all same objects in the tree * fixed identation * fixed multiple selection when have commom objects in the selection. * fixed selection for classes * now the tree is saving in the configurations * fixed attributes when selecting classes * fixed model snapshot when selecting generalization sets * consider IDiagramUIModel as its parent element * now nodes of the tree are being inserted sorted. * now tree is organized per type AND alphabetically * added associations and generalizations to the package tree * select classes of the same type of the attribute selected. * check types for subtree * request improved * improved tree cell renderer * 1st version export view * new export to gufo window finished * fixed diagram saving element * added new icons * new icons * icon for package changed * fixed model building * improved selection for similar node * improved threads * changed icon for association end * name for association end * changed name root element for diagram tree * fixed nullpointer * add labels for combos * resize window false * prevent window export to be opened twice * prevent config window to be opened twice * changed UI export * removed unused component * adjust in UI * adjust in UI * improved layout * fixed label * layout improvement * adjust * new layout for export - wip * layout improvement - wip * added table * added packages tab * Changed labels * Added default language option * layout adjust * update * ui updated * adjust ui * Adjusted labels * Set Base IRI default value * UI fixes * changed default behavior for tables * get json string from tables * generating json to send transformation to server * Bugfix on allowed nature serialization * Updates export file format and datatype serialization * Minor refactoring * Bugfix tag removal on apply meta-properties * Updates meta-property serialization * Minor presentation issue * Bugfix on suggested stereotypes * Bugifx on gufo options export * fixed model building for tree and package * added port number to the default server * code improved * adjusted images * select generalizations when g_set is selected * fixed tree for diagram and package views * fixed serialization * fixed name of the generalizations in the tree * Fixed element and package mapping serialization Removed duplicate code * General code improvements * Smart painting based on restrictedTo meta-property * Fixed bugs related to tagged values * Updates listeners for restrictedTo inference * Updates inference criteria * Updates ApplyProperties * Improving manipulation of tagged values * Updates interaction with tagged values * BugFix - Add listeners in projects that were "not created" (when the tool open without opening an existing project) - Binds tagged value definitions to to stereotypes instead of simply adding them to the stereotype's tagged value definition container * Bugfix and cleanup * Bugfix Updates color when adding existing model element to diagram * Updates smart modeling of historical roles * BugFixes and updates menu ordering, menu access, and color scheme * Bugfix historicalRole rule * Updates «historicalRoleMixin» * Updates applicable stereotype based on generalization * Updates association constraints JSON file * Updates association constraints JSON file * Updates ReportErrorAction * Updates guides and bug report * Updates README * Updates images size * Updates report error URL * Updates README * Updates plugin update feature * Updates README * Bugfix default cardinalities * Updates situations support * Updates README Co-authored-by: Tiago Prince Sales <tiago.princesales@unibz.it> Co-authored-by: Claudenir M. Fonseca <claudenirmf@gmail.com> Co-authored-by: Tiago Prince Sales <tgoprince@users.noreply.github.com> Co-authored-by: Viola <victorviola86@gmail.com> Co-authored-by: Victor Viola <victor.viola@farfetch.com> Co-authored-by: Tiago Prince Sales <tgoprince@gmail.com> Co-authored-by: Tiago Prince Sales <tiago.princesales@unibz.it>
- Loading branch information
6 people
authored
Aug 4, 2020
1 parent
2fbb4c5
commit cf9431b