Permalink
Browse files

Cleanup of unneeded files and fixing documentation

  • Loading branch information...
1 parent bac3bdf commit 28eec188805b78c40ff44d3f22c7d3fca8e6e0b3 @TimLethbridge TimLethbridge committed Mar 22, 2016
Showing with 32 additions and 12,104 deletions.
  1. +1 −3 CONTRIBUTING.md
  2. +2 −1 LICENSE.md
  3. +8 −9 README.md
  4. +10 −0 UmpleToTemplate/README.md
  5. +0 −50 UmpleToTemplate/templates/association_Get_All.jet
  6. +0 −493 UmpleToTemplate/templates/association_Set_All.jet
  7. +0 −118 UmpleToTemplate/templates/attribute_Get_All.jet
  8. +0 −38 UmpleToTemplate/templates/attribute_IsBoolean_All.jet
  9. +0 −92 UmpleToTemplate/templates/attribute_Set_All.jet
  10. +0 −10 UmpleToTemplate/templates/state_machine_Events_All.jet
  11. +0 −16 UmpleToTemplate/templates/state_machine_Get_All.jet
  12. +0 −18 UmpleToTemplate/templates/state_machine_Set_All.jet
  13. +0 −6 Umplificator/JavaToUmple/.classpath
  14. +0 −4 Umplificator/JavaToUmple/.jetproperties
  15. +0 −23 Umplificator/JavaToUmple/.project
  16. +0 −12 Umplificator/JavaToUmple/.settings/org.eclipse.jdt.core.prefs
  17. +0 −20 Umplificator/JavaToUmple/src/cruise/umple/ignore/Ignore.java
  18. +0 −139 Umplificator/JavaToUmple/src/cruise/umple/umplificator/umple/UmpleClassGenerator.java
  19. +0 −26 Umplificator/JavaToUmple/templates/UmpleClassGenerator.jumpjet
  20. +0 −22 Umplificator/JavaToUmple/templates/UmpleInterfaceGenerator.jumpjet
  21. +0 −3 Umplificator/JavaToUmple/templates/UmpleNotice.jet
  22. +0 −15 Umplificator/JavaToUmple/templates/code_injections.jet
  23. +0 −10 Umplificator/JavaToUmple/templates/depends.jet
  24. +0 −10 Umplificator/JavaToUmple/templates/depends_interface.jet
  25. +0 −25 Umplificator/JavaToUmple/templates/generator.skeleton
  26. +0 −32 Umplificator/JavaToUmple/templates/inheritance.jet
  27. +0 −18 Umplificator/JavaToUmple/templates/inheritance_interface.jet
  28. +0 −3 Umplificator/JavaToUmple/templates/members_AllAssociations.jet
  29. +0 −14 Umplificator/JavaToUmple/templates/members_AllAttributes.jet
  30. +0 −1 Umplificator/JavaToUmple/templates/members_AllMethods.jet
  31. +0 −133 Umplificator/build/build.umplificatorplugin.xml
  32. +0 −17 Umplificator/build/build.xml
  33. +0 −7 Umplificator/cruise.umple.umplificator.core.ui/.classpath
  34. +0 −28 Umplificator/cruise.umple.umplificator.core.ui/.project
  35. +0 −8 Umplificator/cruise.umple.umplificator.core.ui/.settings/org.eclipse.jdt.core.prefs
  36. +0 −21 Umplificator/cruise.umple.umplificator.core.ui/META-INF/MANIFEST.MF
  37. +0 −4 Umplificator/cruise.umple.umplificator.core.ui/README.txt
  38. +0 −6 Umplificator/cruise.umple.umplificator.core.ui/build.properties
  39. BIN Umplificator/cruise.umple.umplificator.core.ui/icons/UmpleLogo32.gif
  40. +0 −69 Umplificator/cruise.umple.umplificator.core.ui/plugin.xml
  41. +0 −50 .../cruise.umple.umplificator.core.ui/src/main/java/cruise/umple/umplificator/core/ui/Activator.java
  42. +0 −238 ...se.umple.umplificator.core.ui/src/main/java/cruise/umple/umplificator/core/ui/ProjectLocator.java
  43. +0 −126 ...ificator.core.ui/src/main/java/cruise/umple/umplificator/core/ui/action/UmplifyElementAction.java
  44. +0 −485 ...ificator.core.ui/src/main/java/cruise/umple/umplificator/core/ui/views/workflow/WorkFlowView.java
  45. +0 −101 ...lificator.core.ui/src/main/java/cruise/umple/umplificator/core/ui/wizards/UmplificatorWizard.java
  46. +0 −82 ...ui/src/main/java/cruise/umple/umplificator/core/ui/wizards/UmplificatorWizardAssociationPage.java
  47. +0 −81 ...e.ui/src/main/java/cruise/umple/umplificator/core/ui/wizards/UmplificatorWizardAttributePage.java
  48. +0 −41 ...cator.core.ui/src/main/java/cruise/umple/umplificator/core/ui/wizards/UmplificatorWizardPage.java
  49. +0 −12 Umplificator/cruise.umple.umplificator.core/.classpath
  50. +0 −28 Umplificator/cruise.umple.umplificator.core/.project
  51. +0 −12 Umplificator/cruise.umple.umplificator.core/.settings/org.eclipse.jdt.core.prefs
  52. +0 −29 Umplificator/cruise.umple.umplificator.core/META-INF/MANIFEST.MF
  53. +0 −4 Umplificator/cruise.umple.umplificator.core/README.txt
  54. +0 −5 Umplificator/cruise.umple.umplificator.core/build.properties
  55. +0 −139 ...or/cruise.umple.umplificator.core/src/main/gen/cruise/umple/umplificator/UmpleClassGenerator.java
  56. +0 −94 ...ruise.umple.umplificator.core/src/main/gen/cruise/umple/umplificator/UmpleInterfaceGenerator.java
  57. +0 −54 ...icator/cruise.umple.umplificator.core/src/main/java/cruise/umple/umplificator/core/Activator.java
  58. +0 −140 ....umple.umplificator.core/src/main/java/cruise/umple/umplificator/core/analyzer/FieldAnalyzer.java
  59. +0 −119 ...umplificator.core/src/main/java/cruise/umple/umplificator/core/generator/umple/FileGenerator.java
  60. +0 −282 ...tor.core/src/main/java/cruise/umple/umplificator/core/generator/umple/JavaMetamodelConverter.java
  61. +0 −115 ...mplificator.core/src/main/java/cruise/umple/umplificator/core/generator/umple/UmpleGenerator.java
  62. +0 −70 ....umplificator.core/src/main/java/cruise/umple/umplificator/core/inventory/JavaClassInventory.java
  63. +0 −35 ...mplificator.core/src/main/java/cruise/umple/umplificator/core/inventory/JavaPackageInventory.java
  64. +0 −36 ...mplificator.core/src/main/java/cruise/umple/umplificator/core/inventory/JavaProjectInventory.java
  65. +0 −149 ...ruise.umple.umplificator.core/src/main/java/cruise/umple/umplificator/core/types/JavaProject.java
  66. +0 −35 .../cruise.umple.umplificator.core/src/main/java/cruise/umple/umplificator/core/types/UmpleType.java
  67. +0 −265 ...ple.umplificator.core/src/main/java/cruise/umple/umplificator/core/util/JavaProjectSetupUtil.java
  68. +0 −62 ...lificator.core/src/main/test/cruise/umple/umplificator/core/inventory/JavaClassInventoryTest.java
  69. +0 −45 ...uise.umple.umplificator.core/src/main/test/cruise/umple/umplificator/core/inventory/TestUtil.java
  70. +0 −7 Umplificator/cruise.umple.umplificator.model.workflow.edit/.classpath
  71. +0 −28 Umplificator/cruise.umple.umplificator.model.workflow.edit/.project
  72. +0 −18 Umplificator/cruise.umple.umplificator.model.workflow.edit/META-INF/MANIFEST.MF
  73. +0 −14 Umplificator/cruise.umple.umplificator.model.workflow.edit/build.properties
  74. BIN Umplificator/cruise.umple.umplificator.model.workflow.edit/icons/checked.jpg
  75. BIN ....workflow.edit/icons/full/ctool16/CreateRefactoringTask_refactoringSubTask_RefactoringSubTask.gif
  76. BIN ...mplificator.model.workflow.edit/icons/full/ctool16/CreateWorkflow_adapterTask_RefactoringTask.gif
  77. BIN ...ficator.model.workflow.edit/icons/full/ctool16/CreateWorkflow_refactoringTask_RefactoringTask.gif
  78. BIN ...mplificator.model.workflow.edit/icons/full/ctool16/CreateWorkflow_refactoring_RefactoringTask.gif
  79. BIN Umplificator/cruise.umple.umplificator.model.workflow.edit/icons/full/obj16/RefactoringSubTask.gif
  80. BIN Umplificator/cruise.umple.umplificator.model.workflow.edit/icons/full/obj16/RefactoringTask.gif
  81. BIN Umplificator/cruise.umple.umplificator.model.workflow.edit/icons/full/obj16/Workflow.gif
  82. BIN Umplificator/cruise.umple.umplificator.model.workflow.edit/icons/unchecked.gif
  83. +0 −40 Umplificator/cruise.umple.umplificator.model.workflow.edit/plugin.properties
  84. +0 −25 Umplificator/cruise.umple.umplificator.model.workflow.edit/plugin.xml
  85. +0 −233 ...ow.edit/src/cruise/umple/umplificator/model/workflow/provider/RefactoringSubTaskItemProvider.java
  86. +0 −328 ...kflow.edit/src/cruise/umple/umplificator/model/workflow/provider/RefactoringTaskItemProvider.java
  87. +0 −93 ...low.edit/src/cruise/umple/umplificator/model/workflow/provider/RefactoringWorkflowEditPlugin.java
  88. +0 −202 ...del.workflow.edit/src/cruise/umple/umplificator/model/workflow/provider/WorkflowItemProvider.java
  89. +0 −255 ...dit/src/cruise/umple/umplificator/model/workflow/provider/WorkflowItemProviderAdapterFactory.java
  90. +0 −7 Umplificator/cruise.umple.umplificator.model.workflow/.classpath
  91. +0 −28 Umplificator/cruise.umple.umplificator.model.workflow/.project
  92. +0 −3 Umplificator/cruise.umple.umplificator.model.workflow/.settings/org.eclipse.core.resources.prefs
  93. +0 −8 Umplificator/cruise.umple.umplificator.model.workflow/.settings/org.eclipse.jdt.core.prefs
  94. +0 −22 Umplificator/cruise.umple.umplificator.model.workflow/META-INF/MANIFEST.MF
  95. +0 −14 Umplificator/cruise.umple.umplificator.model.workflow/build.properties
  96. +0 −28 Umplificator/cruise.umple.umplificator.model.workflow/model/RefactoringWorkflow.genmodel
  97. +0 −100 Umplificator/cruise.umple.umplificator.model.workflow/model/workflow.ecore
  98. +0 −8 Umplificator/cruise.umple.umplificator.model.workflow/plugin.properties
  99. +0 −26 Umplificator/cruise.umple.umplificator.model.workflow/plugin.xml
  100. +0 −28 Umplificator/cruise.umple.umplificator.model.workflow/schema/workflow.xsd
  101. +0 −50 ...ise.umple.umplificator.model.workflow/src/cruise/umple/umplificator/model/workflow/Activator.java
  102. +0 −166 ....umplificator.model.workflow/src/cruise/umple/umplificator/model/workflow/RefactoringSubTask.java
  103. +0 −186 ...ple.umplificator.model.workflow/src/cruise/umple/umplificator/model/workflow/RefactoringTask.java
  104. +0 −75 ...uise.umple.umplificator.model.workflow/src/cruise/umple/umplificator/model/workflow/Workflow.java
  105. +0 −64 ...ple.umplificator.model.workflow/src/cruise/umple/umplificator/model/workflow/WorkflowFactory.java
  106. +0 −512 ...ple.umplificator.model.workflow/src/cruise/umple/umplificator/model/workflow/WorkflowPackage.java
  107. +0 −363 ...ator.model.workflow/src/cruise/umple/umplificator/model/workflow/impl/RefactoringSubTaskImpl.java
  108. +0 −422 ...ficator.model.workflow/src/cruise/umple/umplificator/model/workflow/impl/RefactoringTaskImpl.java
  109. +0 −121 ...ficator.model.workflow/src/cruise/umple/umplificator/model/workflow/impl/WorkflowFactoryImpl.java
  110. +0 −226 ...e.umplificator.model.workflow/src/cruise/umple/umplificator/model/workflow/impl/WorkflowImpl.java
  111. +0 −454 ...ficator.model.workflow/src/cruise/umple/umplificator/model/workflow/impl/WorkflowPackageImpl.java
  112. +0 −138 ...kflow/src/cruise/umple/umplificator/model/workflow/managers/CreateRefactoringWorkflowManager.java
  113. +0 −160 ...ator.model.workflow/src/cruise/umple/umplificator/model/workflow/util/WorkflowAdapterFactory.java
  114. +0 −56 ...model.workflow/src/cruise/umple/umplificator/model/workflow/util/WorkflowResourceFactoryImpl.java
  115. +0 −32 ...icator.model.workflow/src/cruise/umple/umplificator/model/workflow/util/WorkflowResourceImpl.java
  116. +0 −172 ...umplificator.model.workflow/src/cruise/umple/umplificator/model/workflow/util/WorkflowSwitch.java
  117. +0 −54 ...icator.model.workflow/src/cruise/umple/umplificator/model/workflow/util/WorkflowXMLProcessor.java
  118. +0 −7 Umplificator/cruise.umple.umplificator.parser.java/.classpath
  119. +0 −23 Umplificator/cruise.umple.umplificator.parser.java/.project
  120. +0 −12 Umplificator/cruise.umple.umplificator.parser.java/.settings/org.eclipse.jdt.core.prefs
  121. +0 −2,509 Umplificator/cruise.umple.umplificator.parser.java/src/main/java/Java.g
  122. +0 −203 Umplificator/cruise.umple.umplificator.parser.java/src/main/java/Java.tokens
  123. +0 −39 Umplificator/cruise.umple.umplificator.parser.java/src/main/java/Test.java
  124. +0 −78 Umplificator/cruise.umple.umplificator.parser.java/test/School.java
  125. +11 −9 cruise.umple/ReadMe.txt
View
@@ -114,9 +114,7 @@ The umple project is split into many smaller subproject, the folder hierarchy is
* `UmpleToRuby` - Code generation for Ruby*
-* `UmpleToRTCpp` - Code generation for Real-time C++ *
-
-* `~~UmpleToCpp/~~` - Code generation for alternative C++ - historical; to be deleted
+* `UmpleToRTCpp` - Code generation for C++ *
* `UmpleToSDL` - Code generation to convert Umple to SDL*
View
@@ -17,7 +17,8 @@ Jason Canto, Ellen Arteca, Alexi Turcotte, Karin Ng, Mark Galloway,
Alexander Ringeri, Antonio Maria Pereria de Resende, Craig Bryan, Eric Telmer,
Charles Wang, Chan Chun Kit, Nabil Maadarani, John Zweip, Kevin Brightwell,
Warren Marivel, Ashley Merman, Xinxin Kou, Aymen Ben Rkhis, Curtis Meerkerk, Adam Kereliuk,
-Matthew Fritze
+Matthew Fritze, Michael Mkicik, Victoria Lacroix, Morgan Redshaw, Matthew Rodusek,
+Shikib Mehri
Permission is hereby granted, free of charge, to any person
obtaining a copy of this software and associated documentation
View
@@ -11,16 +11,16 @@ OS | Linux | OSX | Windows
This is the main project for various Umple subprojects and components.
-Umple is a model-oriented programming technology. It allows developers to embed modelling concepts (e.g. UML associations, state machines), patterns and other abstractions in traditional code, and vice versa. It generates high quality code for Java, C++ and PhP (and can be embedded in or embed these), as well as diagrams, metrics and many other artifacts.
+Umple is a model-oriented programming technology. It allows developers to embed modelling concepts (e.g. UML associations, state machines), patterns, generation templates, and other abstractions in traditional code, and vice versa. It generates high quality code for Java, C++ and PhP (and can be embedded in or embed these), as well as diagrams, metrics and many other artifacts.
The project homepage is located at http://umple.org/
##Development
Umple is developed in itself, guaranteeing robustness, the most recent version of the compiler must be used to compile itself. See the wiki for development setup.
-Development follows a model-driven, test-driven, agile, continuous-integration process. Umple is hosted currently on Github at http://code.umple.org. It was first released in 2007, and the master was on Google Code from 2011 to 2015.
+Development follows a model-driven, test-driven, agile, continuous-integration process. Umple is hosted currently on Github at http://code.umple.org. It was first released in 2007, and the master was on Google Code from 2011 to mid 2015.
-Umple has been largely developed as a research project at the University of Ottawa, Canada, by numerous PhD and masters students, Many undergraduates from across Canada and the USA have also contributed. See the license file for the list of contributors.
+Umple has been largely developed as a research project at the University of Ottawa, Canada, by numerous PhD and masters students, Many undergraduates from across Canada and the USA have also contributed through the UCOSP program. See the license file for the list of contributors.
More details can be found as follows
@@ -37,7 +37,7 @@ Umple is continuously tested and build at the University of Ottawa using CruiseC
The umple project is split into many smaller subproject, the folder hierarchy is explained below to better describe the structure.
* build/
- * Ant build scripts and related information
+ * Ant build scripts and related information including user manual raw data
* cruise.umple/ *Umple compiler*
* See its own ReadMe.txt for further details
@@ -68,17 +68,16 @@ The umple project is split into many smaller subproject, the folder hierarchy is
* ExternalTextEditorPlugins *Plugins for external editors, Notepad++, etc*
-* sandbox *What is this?*
+* sandbox *Small test done before a build to make sure testing and compiling works*
* testbed/, testbed_php/, testbed_ruby/ *Test suites for Java, Php and Ruby respectively*
* UmpleToJava/ *Code generation for Java*
* UmpleToPhp/ *Code generation for Php*
* UmpleToRuby/ *Code generation for Ruby*
-* UmpleToRTCpp/ *Code generation for Real-time C++ *
-* ~~UmpleToCpp/~~ *Code generation for alternative C++ - historical; to be deleted
-* UmpleToSDL/ *Code generation to convert Umple to SDL*
+* UmpleToRTCpp/ *Code generation for C++ *
+* UmpleToSDL/ *Code generation to convert Umple to SDL* (in early development)
* UmpleToSql/ *Code generation SQL from Umple models*
-* UmpleToTemplate/ *Template for creating new code generation subprojects*
+* UmpleToTemplate/ *Location for templates that could be common to subprojects*
* umpleonline/ *The UmpleOnline web application*
* UmpleOnline allows generation of code from Umple directly in a web browser, and also editing of Umple both graphically and textually. Available at http://try.umple.org
@@ -7,3 +7,13 @@ As of the time of writing there are no common templates as we are in the process
to UmpleTL. Any common UmpleTL templates should be put in the UmpleTLTemplates directory if they are
ever created. Any jet templates will be removed.
+The templates that might be considerd putting back here include
+
+* association_Get_All
+* association_Set_All
+* attribute_Get_All
+* attribute_IsBoolean_All
+* attribute_Set_All
+* state_machine_Events_All
+* state_machine_Get_All
+* state_machine_Set_All
@@ -1,50 +0,0 @@
-<%@ jet package="cruise.umple.ignore" class="Ignore"%>
-<%
- // GENERIC FILE - EDIT IN UmpleToTemplate project, then run "ant -f build.codegen.xml to move into the appropriate projects
- for (AssociationVariable av : uClass.getAssociationVariables())
- {
-
- if (!av.getIsNavigable())
- {
- continue;
- }
-
- gen.setParameterConstraintName(av.getName());
-
- List<TraceItem> traceItems = av.getTraced("getMethod", uClass);
-
- String customGetPrefixCode = GeneratorHelper.toCode(uClass.getApplicableCodeInjections("before", gen.translate("getMethod",av)));
- String customGetPostfixCode = GeneratorHelper.toCode(uClass.getApplicableCodeInjections("after", gen.translate("getMethod",av)));
-
- String customGetDefaultPrefixCode = GeneratorHelper.toCode(uClass.getApplicableCodeInjections("before", gen.translate("getDefaultMethod",av)));
- String customGetDefaultPostfixCode = GeneratorHelper.toCode(uClass.getApplicableCodeInjections("after", gen.translate("getDefaultMethod",av)));
-
- String customGetManyPrefixCode = GeneratorHelper.toCode(uClass.getApplicableCodeInjections("before", gen.translate("getManyMethod",av)));
- String customGetManyPostfixCode = GeneratorHelper.toCode(uClass.getApplicableCodeInjections("after", gen.translate("getManyMethod",av)));
-
- String customNumberOfPrefixCode = GeneratorHelper.toCode(uClass.getApplicableCodeInjections("before", gen.translate("numberOfMethod",av)));
- String customNumberOfPostfixCode = GeneratorHelper.toCode(uClass.getApplicableCodeInjections("after", gen.translate("numberOfMethod",av)));
-
- String customHasManyPrefixCode = GeneratorHelper.toCode(uClass.getApplicableCodeInjections("before", gen.translate("hasManyMethod",av)));
- String customHasManyPostfixCode = GeneratorHelper.toCode(uClass.getApplicableCodeInjections("after", gen.translate("hasManyMethod",av)));
-
- String customIndexOfPrefixCode = GeneratorHelper.toCode(uClass.getApplicableCodeInjections("before", gen.translate("indexOfMethod",av)));
- String customIndexOfPostfixCode = GeneratorHelper.toCode(uClass.getApplicableCodeInjections("after", gen.translate("indexOfMethod",av)));
-
- boolean hasCodeInjections = customGetPrefixCode != null || customGetPostfixCode != null;
-
- if (av.isOne())
- {
- %><%@ include file="association_GetOne.jet" %><%
- }
- else if (av.isMany())
- {
- %><%@ include file="association_GetMany.jet" %><%
- }
- else
- {
- %>UNABLE TO UNDERSAND association variable (see association_Get_All.jet)<%
- }
- }
- gen.setParameterConstraintName("");
-%>
Oops, something went wrong.

0 comments on commit 28eec18

Please sign in to comment.