diff --git a/src/main/java/com/hy/java/uct/umlrecog/UMLDiagramRecognizer.java b/src/main/java/com/hy/java/uct/umlrecog/UMLDiagramRecognizer.java index 76c40289b3181be0904149e2c10553fb3ee94286..f52c7a532f1632ee0aebf2c2effcb331dd2e3454 100644 --- a/src/main/java/com/hy/java/uct/umlrecog/UMLDiagramRecognizer.java +++ b/src/main/java/com/hy/java/uct/umlrecog/UMLDiagramRecognizer.java @@ -46,10 +46,20 @@ public class UMLDiagramRecognizer { */ public static void main(String[] args) { // 类图实验 - UMLDiagramRecognizer.recogCD(cd_dir, "rodrigoazevedomartins/TrabalhoFinalLTPIII", false); - UMLDiagramRecognizer.recogCD(cd_dir, "ultragdb/org.eclipse.cdt", false); + UMLDiagramRecognizer.recogCD(cd_dir, "abrden/StarCraft", false); + UMLDiagramRecognizer.recogCD(cd_dir, "alexasahis/km2", false); + UMLDiagramRecognizer.recogCD(cd_dir, "BackupTheBerlios/jpwgen-svn", false); UMLDiagramRecognizer.recogCD(cd_dir, "badqiu/rapid-framework", false); + UMLDiagramRecognizer.recogCD(cd_dir, "bojoer/loadui", false); UMLDiagramRecognizer.recogCD(cd_dir, "C204-242-DJSMT/Assignment-1", false); + UMLDiagramRecognizer.recogCD(cd_dir, "cscfa/bartleby", false); + UMLDiagramRecognizer.recogCD(cd_dir, "dsarlis/SoftEng", false); + UMLDiagramRecognizer.recogCD(cd_dir, "egoless/pqs", false); + UMLDiagramRecognizer.recogCD(cd_dir, "emeric254/Java-STRI-S4", false); + + UMLDiagramRecognizer.recogCD(cd_dir, "bloodmarry12/rapid-framework_googlecode", false); + UMLDiagramRecognizer.recogCD(cd_dir, "rodrigoazevedomartins/TrabalhoFinalLTPIII", false); + UMLDiagramRecognizer.recogCD(cd_dir, "ultragdb/org.eclipse.cdt", false); UMLDiagramRecognizer.recogCD(cd_dir, "georgejakes/Xug", false); UMLDiagramRecognizer.recogCD(cd_dir, "hungnguyen94/BTrouble", false); UMLDiagramRecognizer.recogCD(cd_dir, "klemens/openolat", false); @@ -57,14 +67,6 @@ public class UMLDiagramRecognizer { UMLDiagramRecognizer.recogCD(cd_dir, "neuroph/neuroph", false); UMLDiagramRecognizer.recogCD(cd_dir, "PillowSoPaw/SPSWENG-astroNATS", false); UMLDiagramRecognizer.recogCD(cd_dir, "tiendan3108/CP", false); - UMLDiagramRecognizer.recogCD(cd_dir, "abrden/StarCraft", false); - UMLDiagramRecognizer.recogCD(cd_dir, "alexasahis/km2", false); - UMLDiagramRecognizer.recogCD(cd_dir, "BackupTheBerlios/jpwgen-svn", false); - UMLDiagramRecognizer.recogCD(cd_dir, "bloodmarry12/rapid-framework_googlecode", false); - UMLDiagramRecognizer.recogCD(cd_dir, "bojoer/loadui", false); - UMLDiagramRecognizer.recogCD(cd_dir, "dsarlis/SoftEng", false); - UMLDiagramRecognizer.recogCD(cd_dir, "egoless/pqs", false); - UMLDiagramRecognizer.recogCD(cd_dir, "emeric254/Java-STRI-S4", false); UMLDiagramRecognizer.recogCD(cd_dir, "FantomKnight/AndEngine", false); UMLDiagramRecognizer.recogCD(cd_dir, "felps/FTFramework", false); UMLDiagramRecognizer.recogCD(cd_dir, "fltt/jss7", false); @@ -144,7 +146,7 @@ public class UMLDiagramRecognizer { UMLDiagramRecognizer.recogSD(sd_dir, "SpoonLabs/astor", false); UMLDiagramRecognizer.recogSD(sd_dir, "timfel/meet4xmas", false); UMLDiagramRecognizer.recogSD(sd_dir, "Vskilet/eduram", false); - UMLDiagramRecognizer.recogSD(sd_dir, "Rautiainen/Starmap", true); + UMLDiagramRecognizer.recogSD(sd_dir, "Rautiainen/Starmap", false); UMLDiagramRecognizer.recogSD(sd_dir, "zy084232/Knowing-Campus", false); } } diff --git a/src/main/java/com/hy/java/uct/umlrecog/cddetector/ClassDetector.java b/src/main/java/com/hy/java/uct/umlrecog/cddetector/ClassDetector.java index 9784ed8cbfcb9d36eb0da780faf38cd2d5d0da48..4467e4b99850864efe7354b5af7c84c47b4b7585 100644 --- a/src/main/java/com/hy/java/uct/umlrecog/cddetector/ClassDetector.java +++ b/src/main/java/com/hy/java/uct/umlrecog/cddetector/ClassDetector.java @@ -280,6 +280,9 @@ public class ClassDetector { } } if (uc.bottom != null) { + if (uc.bottom.y > uc.whole.y) { + uc.bottom.y = uc.whole.y; + } Imgcodecs.imwrite(temp_res_path, ImgProcessor.cutImage(cls_diagram, uc.bottom)); uc.setMethodsStr(instance.doOCR(new File(temp_res_path))); } diff --git a/src/main/java/com/hy/java/uct/umlrecog/cddetector/ClassRelationDetector.java b/src/main/java/com/hy/java/uct/umlrecog/cddetector/ClassRelationDetector.java index bedc02d9c016b11f3a0c2855fc22ef0a15a8f69c..8b2d5602e2c4d89b3d1a37696ca9e4eb5e2dc4dd 100644 --- a/src/main/java/com/hy/java/uct/umlrecog/cddetector/ClassRelationDetector.java +++ b/src/main/java/com/hy/java/uct/umlrecog/cddetector/ClassRelationDetector.java @@ -426,15 +426,24 @@ public class ClassRelationDetector { dash_rela.source.out_relas.add(dash_rela); dash_rela.target.in_relas.add(dash_rela); break; - } else if (rect_containing_rela_type.contains(dash_rela.poly_line.pt2) || rect_containing_rela_type.contains(ImgProcessor.reachPt(dash_rela.poly_line.pt2, dash_rela.poly_line.l2, 5, false)) - || rect_containing_rela_type.contains(ImgProcessor.reachPt(dash_rela.poly_line.pt2, dash_rela.poly_line.l2, 5, true))) { - belong_to_dash_rela = true; - // 重新设置虚线的source和target。由于目前虚线的端点pt2必须对应target类，所以如果虚线的原source类对应了pt2，则需对换source和target - if (dash_rela.source.whole.contains(ImgProcessor.reachPt(dash_rela.poly_line.pt2, dash_rela.poly_line.l2, 35, false))) { - UMLClass temp = dash_rela.source; - dash_rela.source = dash_rela.target; - dash_rela.target = temp; + } else if (dash_rela.poly_line.pt2 != null) { + if (rect_containing_rela_type.contains(dash_rela.poly_line.pt2) || rect_containing_rela_type.contains(ImgProcessor.reachPt(dash_rela.poly_line.pt2, dash_rela.poly_line.l2, 5, false)) + || rect_containing_rela_type.contains(ImgProcessor.reachPt(dash_rela.poly_line.pt2, dash_rela.poly_line.l2, 5, true))) { + belong_to_dash_rela = true; + // 重新设置虚线的source和target。由于目前虚线的端点pt2必须对应target类，所以如果虚线的原source类对应了pt2，则需对换source和target + if (dash_rela.source.whole.contains(ImgProcessor.reachPt(dash_rela.poly_line.pt2, dash_rela.poly_line.l2, 35, false))) { + UMLClass temp = dash_rela.source; + dash_rela.source = dash_rela.target; + dash_rela.target = temp; + } + dash_rela.source_pt_index = 1; + dash_rela.type = "实现"; + // 记录当前关系到UMLClass里 + dash_rela.source.out_relas.add(dash_rela); + dash_rela.target.in_relas.add(dash_rela); + break; } + } else { dash_rela.source_pt_index = 1; dash_rela.type = "实现"; // 记录当前关系到UMLClass里 diff --git a/src/main/resources/cd/BackupTheBerlios_jpwgen-svn.txt b/src/main/resources/cd/BackupTheBerlios_jpwgen-svn.txt index f6114d2e07a93c726c43e0bca69a7a977b8530bd..885a2ee0bcebd4e6abbda0a851d7c0be6624768b 100644 --- a/src/main/resources/cd/BackupTheBerlios_jpwgen-svn.txt +++ b/src/main/resources/cd/BackupTheBerlios_jpwgen-svn.txt @@ -1,567 +1,412 @@ -© Messages -@¥ BUNDLE_NAME: String -@& getStringd -@#© DefaultBlacklistFilter -@= blacklist: List -@& DefaultBlacklistFilter( -& DefaultBlacklistFilter) -© addToBlacklist) - -o filter() - -o filter( - -© getBlacklistQ - -© getDescription0 - -e getIDQ - -© removefromBlacklistQ -o setBlacklist) - -o setDescription0 - -o setIDO -@© DefaultBlacklistFilter -%«interfaces -© |PasswordFilter -%实现￥#«interfaces -© |PasswordFilter -@@© addToBlacklist) - -o filter() - -o filter( - -© getBlacklistQ - -© getDescription0 - -e getIDQ - -© removefromBlacklistQ -o setBlacklist) - -o setDescription0 - -® setlD) -@© DefaultBlacklistFilter -%«interfaces -© |PasswordFilter -%实现￥#© PwElemen -@© type: int -o value: String -@& PwElerment( -° getTypeO -o getvalue) -o setType( -o setValue) -@#© DefaultRegExFilter -@= blacklist: List -@& DefaultRegExFilterQ -& DefaultRegExFilter( -© addToBlacklist) - -o filter() - -o filter( - -© getBlacklistQ - -© getDescription0 - -e getIDQ - -© removefromBlacklistQ -o setBlacklist) - -o setDescription0 - -o setIDO -@© DefaultRegExFilter -%«interfaces -© |PwGenRegEx -%实现￥© DefaultRegExFilter -%«Interfaces -© |PwGenConstants -%实现￥#© PwGenerator -@e defaultBlacklistFilter: IPasswordF -e defaultRegexFilter: IPasswordFilt -¥ LOGGER_CONFIG: String -@& PwGeneratorQ - -o addFilterQ - -o generatePassword( - -© getDefaultBlacklistFilter( -© getDefaultRegexFilter( -& mainQ - -o print( - -© printColumns - -© processg - -o removeFilter( - -o removeFilter( - -o setDefaultBlacklistFilter) -o setDefaultRegexFilter( -o setloglevel() -@#© PwGenerator -= defaultBlacklistFilter: IPasswordF -s defaultRegexFilter: IPasswordFilt -¥ LOGGER_CONFIG: String -¢ PwGenerator() -o addFilterQ -o generatePassword0 -o getDefaultBlacklistFilter( -o getDefaultRegexFilterQ -¢ mainQ -® printQ -® printColumns -® process) -o removeFilterQ -o removeFilterQ -o setDefaultBlacklistFilter( -o setDefaultRegexFilter( -o setLoglevel( -@null@null@© PwGenerator -= defaultBlacklistFilter: IPasswordF -s defaultRegexFilter: IPasswordFilt -¥ LOGGER_CONFIG: String -¢ PwGenerator() -o addFilterQ -o generatePassword0 -o getDefaultBlacklistFilter( -o getDefaultRegexFilterQ -¢ mainQ -® printQ -® printColumns -® process) -o removeFilterQ -o removeFilterQ -o setDefaultBlacklistFilter( -o setDefaultRegexFilter( -o setLoglevel( -%«interfaces -© |PwGenCommandLineOptions -%实现￥© PwGenerator -= defaultBlacklistFilter: IPasswordF -s defaultRegexFilter: IPasswordFilt -¥ LOGGER_CONFIG: String -¢ PwGenerator() -o addFilterQ -o generatePassword0 -o getDefaultBlacklistFilter( -o getDefaultRegexFilterQ -¢ mainQ -® printQ -® printColumns -® process) -o removeFilterQ -o removeFilterQ -o setDefaultBlacklistFilter( -o setDefaultRegexFilter( -o setLoglevel( -%«interfaces -© |PwGenRegEx -%实现￥© PwGenerator -= defaultBlacklistFilter: IPasswordF -s defaultRegexFilter: IPasswordFilt -¥ LOGGER_CONFIG: String -¢ PwGenerator() -o addFilterQ -o generatePassword0 -o getDefaultBlacklistFilter( -o getDefaultRegexFilterQ -¢ mainQ -® printQ -® printColumns -® process) -o removeFilterQ -o removeFilterQ -o setDefaultBlacklistFilter( -o setDefaultRegexFilter( -o setLoglevel( -%«Interfaces -© |PwGenConstants -%实现￥#? RandomFactory -@@£ getAlgorithmsQ - -& getlnstance( - -© getlogger0 - -© getProvidersQ - -© getRandom( - -© getRandom( - -© getSecureRandom) -© getSecureRandom) -© getSecureRandom) -# getServiceProviderfor -# getServiceProvidersQ -& mainQ - -o setlogger( -@? RandomFactory -%«interfaces -© |RandomFactory -%实现￥#«interfaces -© |RandomFactory -@¥ ALG_DEFAULT: String - -¥ ALG_PARSE_STRING: String - -¥ ALG_SHALPRNG: String - -¥ PROVIDER_DEFAULT: String - -¥ PROVIDER_SOFTWARE: String -¥ PROVIDER_SUN: String - -¥ TYPE_RANDOM; String - -¥ TYPE_SECURE_RANDOM: String -@© getAlgorithms( - -o getLogger0 - -o getProviders) - -o getRandom( - -o getRandom( - -o getSecureRandomo - -o getSecureRandom0 - -o getSecureRandom0 - -o getServiceProviderFor0 -® setlogger() -@? RandomFactory -%«interfaces -© |RandomFactory -%实现￥#«interfaces -© |PwGenCommandLineOptions -@¥ CL_AMBIGOUS: String - -¥ CL_AMBIGOUS_DESC: String - -¥ CL_AMBIGOUS_LONG: String - -¥ CL_CAPITALIZE: String - -¥ CL_CAPITALIZE_DESC: String - -¥ CL_CAPITALIZE_LONG: String - -¥ CL_COLUMN: String - -¥ CL_COLUMN_DESC: String - -¥ CL_COLUMN_LONG: String - -¥ CL_HELP: String - -¥ CL_HELP_DESC: String - -¥ CL_HELP_LONG: String - -¥ CL_MAX_ATTEMPTS: String - -¥ CL_MAX_ATTEMPTS_DESC: String - -¥ CL_MAX_ATTEMPTS_LONG: String - -¥ CL_NO_AMBIGOUS: String - -¥ CL_NO_AMBIGOUS_DESC: String - -¥ CL_NO_AMBIGOUS_LONG: String - -¥ CL_NO_CAPITALIZE: String - -¥ CL_NO_CAPITALIZE_DESC: String - -¥ CL_NO_CAPITALIZE_LONG: String - -¥ CL_NO_NUMERALS: String - -¥ CL_NO_NUMERALS_DESC: String - -¥ CL_NO_NUMERALS_LONG: String - -¥ CL_NO_SYMBOLS: String - -¥ CL_NO_SYMBOLS_DESC: String - -¥ CL_NO_SYMBOLS_LONG: String - -¥ CL_NUMBER_PASSWORD: String - -¥ CL_NUMBER_PASSWORD_DESC: String - -¥ CL_NUMBER_PASSWORD_LONG: String - -¥ CL_NUMERALS: String - -¥ CL_NUMERALS_DESC: String - -¥ CL_NUMERALS_LONG: String - -¥ CL_PASSWORD_LENGTH: String - -¥ CL_PASSWORD_LENGTH_DESC: String - -¥ CL_PASSWORD_LENGTH_LONG: String - -¥ CL_PROVIDERS: String - -¥ CL_PROVIDERS_DESC: String - -¥ CL_PROVIDERS_LONG: String - -¥ CL_RANDOM: String - -¥ CL_RANDOM_DESC: String - -¥ CL_RANDOM_LONG: String - -¥ CL_REGEX_AT_LEAST_2_DIGITS: String - -¥ CL_REGEX_AT_LEAST_2_DIGITS_DESC: String -¥ CL_REGEX_AT_LEAST_2_DIGITS_LONG: String -¥ CL_REGEX_AT_LEAST_2_SYMEOLS: String - -¥ CL_REGEX_AT_LEAST_2_SYMBOLS_DESC: String -¥ CL_REGEX_AT_LEAST_2_SYMBOLS_LONG: String -¥ CL_REGEX_ENDS_NO_DIGIT: String - -¥ CL_REGEX_ENDS_NO_DIGIT_DESC: String - -¥ CL_REGEX_ENDS_NO_DIGIT_LONG: String - -¥ CL_REGEX_ENDS_NO_SMALL_LETTER: String - -¥ CL_REGEX_ENDS_NO_SMALL_LETTER_DESC: String -¥ CL_REGEX_ENDS_NO_SMALL_LETTER_LONG: String -¥ CL_REGEX_ENDS_NO_SYMBOL: String - -¥ CL_REGEX_ENDS_NO_SYMBOL_DESC: String - -¥ CL_REGEX_ENDS_NO_SYMBOL_LONG: String - -¥ CL_REGEX_ENDS_NO_UPPER_LETTER: String - -¥ CL_REGEX_ENDS_NO_UPPER_LETTER_DESC: String -¥ CL_REGEX_ENDS_NO_UPPER_LETTER_LONG: String -¥ CL_REGEX_ONLY_1_CAPITAL: String - -¥ CL_REGEX_ONLY_1_CAPITAL_DESC: String - -¥ CL_REGEX_ONLY_1_CAPITAL_LONG: String - -¥ CL_REGEX_ONLY_1_DIGIT: String - -¥ CL_REGEX_ONLY_1_DIGIT_DESC: String - -¥ CL_REGEX_ONLY_1_DIGIT_LONG: String - -¥ CL_REGEX_ONLY_1_SYMBOL: String - -¥ CL_REGEX_ONLY_1_SYMBOL_DESC: String - -¥ CL_REGEX_ONLY_1_SYMBOL_LONG: String - -¥ CL_REGEX_STARTS_NO_DIGIT: String - -¥ CL_REGEX_STARTS_NO_DIGIT_DESC: String - -¥ CL_REGEX_STARTS_NO_DIGIT_LONG: String - -¥ CL_REGEX_STARTS_NO_SMALL_LETTER: String -¥ CL_REGEX_STARTS_NO_SMALL_LETTER_DESC: String -¥ CL_REGEX_STARTS_NO_SMALL_LETTER_LONG: String -¥ CL_REGEX_STARTS_NO_SYMBOL: String - -¥ CL_REGEX_STARTS_NO_SYMBOL_DESC: String -¥ CL_REGEX_STARTS_NO_SYMBOL_LONG: String -¥ CL_REGEX_STARTS_NO_UPPER_LETTER: String -¥ CL_REGEX_STARTS_NO_UPPER_LETTER_DESC: String -¥ CL_REGEX_STARTS_NO_UPPER_LETTER_LONG: String -¥ CL_SR_ALGORITHM: String - -¥ CL_SR_ALGORITHM_DESC: String - -¥ CL_SR_ALGORITHM_LONG: String - -¥ CL_SR_PROVIDERS: String - -¥ CL_SR_PROVIDERS_DESC: String - -¥ CL_SR_PROVIDERS_LONG: String - -¥ CL_SYMBOLS: String - -¥ CL_SYMBOLS_DESC: String - -¥ CL_SYMBOLS_LONG: String - -¥ CL_TERM_WIDTH: String - -¥ CL_TERM_WIDTH_DESC: String - -¥ CL_TERM_WIDTH_LONG: String -@null@© PwGenerator -= defaultBlacklistFilter: IPasswordF -s defaultRegexFilter: IPasswordFilt -¥ LOGGER_CONFIG: String -¢ PwGenerator() -o addFilterQ -o generatePassword0 -o getDefaultBlacklistFilter( -o getDefaultRegexFilterQ -¢ mainQ -® printQ -® printColumns -® process) -o removeFilterQ -o removeFilterQ -o setDefaultBlacklistFilter( -o setDefaultRegexFilter( -o setLoglevel( -%«interfaces -© |PwGenCommandLineOptions -%实现￥#«Interfaces -© |PwGenConstants -@¥ CONSONANT: int - -¥ DEFAULT_DO_COLUMNS: boolean - -¥ DEFAULT_NUMBER_OF_COLUMNS: int -¥ DEFAULT_NUMBER_OF_PASSWORDS: int -¥ DEFAULT_PASSWORD_LENGTH: int -¥ DEFAULT_TERM_WIDTH: int - -¥ DIPTHONG: int - -Y NOT_FIRST: int - -¥ P _AMBIGUOUS: int - -¥ Py _AMBIGUOUS_SYMBOLS: String - -¥ PW_DIGITS: int - -¥ Py _SPECIAL_SYMBOLS: String - -¥ P _SYMBOLS: int - -¥ Py _UPPERS: int - -Y VOWEL: int -@null@© PwGenerator -= defaultBlacklistFilter: IPasswordF -s defaultRegexFilter: IPasswordFilt -¥ LOGGER_CONFIG: String -¢ PwGenerator() -o addFilterQ -o generatePassword0 -o getDefaultBlacklistFilter( -o getDefaultRegexFilterQ -¢ mainQ -® printQ -® printColumns -® process) -o removeFilterQ -o removeFilterQ -o setDefaultBlacklistFilter( -o setDefaultRegexFilter( -o setLoglevel( -%«Interfaces -© |PwGenConstants -%实现￥© DefaultRegExFilter -%«Interfaces -© |PwGenConstants -%实现￥#«interfaces -© |PwGenRegEx -@¥ REGEX_AT_LEAST_2_DIGITS: String - -¥ REGEX_AT_LEAST_2_DIGITS_FLAG: int - -¥ REGEX_AT_LEAST_2_SYMBOLS: String - -¥ REGEX_AT_LEAST_2_SYMBOLS_FLAG: int - -¥ REGEX_ENDS_NO_DIGIT: String - -¥ REGEX_ENDS_NO_DIGIT_FLAG: int - -¥ REGEX_ENDS_NO_SMALL_LETTER; String - -¥ REGEX_ENDS_NO_SMALL_LETTER_FLAG: int -¥ REGEX_ENDS_NO_SYMBOL: String - -¥ REGEX_ENDS_NO_SYMBOL_FLAG: int - -¥ REGEX_ENDS_NO_UPPER_LETTER: String - -¥ REGEX_ENDS_NO_UPPER_LETTER_FLAG: int -¥ REGEX_ONLY_1_CAPITAL: String - -¥ REGEX_ONLY_1_CAPITAL_FLAG: int - -¥ REGEX_ONLY_1_DIGIT: String - -¥ REGEX_ONLY_1_DIGIT_FLAG: int - -¥ REGEX_ONLY_1_SYMBOL: String - -¥ REGEX_ONLY_1_SYMBOL_FLAG: int - -¥ REGEX_STARTS_NO_DIGIT: String - -¥ REGEX_STARTS_NO_DIGIT_FLAG: int - -¥ REGEX_STARTS_NO_SMALL_LETTER: String -¥ REGEX_STARTS_NO_SMALL_LETTER_FLAG: int -¥ REGEX_STARTS_NO_SYMBOL: String - -¥ REGEX_STARTS_NO_SYMBOL_FLAG: int - -¥ REGEX_STARTS_NO_UPPER_LETTER: String -¥ REGEX_STARTS_NO_UPPER_LETTER_FLAG: int -@null@© DefaultRegExFilter -%«interfaces -© |PwGenRegEx -%实现￥© PwGenerator -= defaultBlacklistFilter: IPasswordF -s defaultRegexFilter: IPasswordFilt -¥ LOGGER_CONFIG: String -¢ PwGenerator() -o addFilterQ -o generatePassword0 -o getDefaultBlacklistFilter( -o getDefaultRegexFilterQ -¢ mainQ -® printQ -® printColumns -® process) -o removeFilterQ -o removeFilterQ -o setDefaultBlacklistFilter( -o setDefaultRegexFilter( -o setLoglevel( -%«interfaces -© |PwGenRegEx -%实现￥# \ No newline at end of file +(2626,26)IPwGenCommandLineOptions +@+Attributel + ++Attribute2 + ++Attribute3 + ++Attribute4 + ++Attribute5 + ++Attribute6 + ++Attribute7 + ++Attribute8 + ++Attribute9 + ++Attribute10 ++Attribute11 ++Attribute12 ++Attribute13 ++Attribute14 ++Attribute15 ++Attribute16 ++Attributel7 ++Attribute18 ++Attribute19 ++Attribute20 ++Attribute21 ++Attribute22 ++Attribute23 ++Attribute24 ++Attribute25 ++Attribute26 ++Attribute27 ++Attribute28 ++Attribute29 ++Attribute30 ++Attribute31 ++Attribute32 ++Attribute33 ++Attribute34 ++Attribute35 ++Attribute36 ++Attribute37 ++Attribute38 ++Attribute39 ++Attribute40 ++Attribute41 ++Attribute42 ++Attribute43 ++Attribute44 ++Attribute45 ++Attribute46 ++Attribute47 ++Attribute48 ++Attribute49 ++Attribute50 ++Attribute51 ++Attribute52 ++Attribute53 ++Attribute54 ++Attribute55 ++Attribute56 ++Attribute57 ++Attribute58 ++Attribute59 ++Attribute60 ++Attribute61 ++Attribute62 ++Attribute63 ++Attribute64 ++Attribute65 ++Attribute66 ++Attribute67 ++Attribute68 ++Attribute69 ++Attribute70 ++Attribute71 ++Attribute72 ++Attribute73 ++Attribute74 ++Attribute75 ++Attribute76 ++Attribute77 ++Attribute78 ++Attribute79 ++Attribute80 ++Attribute81 ++Attribute82 ++Attribute83 ++Attribute84 ++Attribute85 +@IPwGenCommandLineOptions +@#(46,2286)MESSAGES +@MESSAGES ++Bundle_name: String ++getStrin() +@MESSAGES +@#(946,2226)IPwFilter +@@IPwFilter ++addToBlacklist() ++filter() ++getBlacklist() ++getDescription() ++getlD() ++removeFromBlacklist() ++setBlacklist() +1+eatDecerrintion() +@#(1806,2146)DefaultBlacklistFilter +@+Attributel +@DefaultBlacklistFilter ++Attributel ++Operation1() ++Operation2() ++Operation3() ++Operation4() ++Operation5() ++Operation6() ++Operation7() ++Operation8() ++Operation9() ++Operation10() +@#(1339,2242)@null@null@#(1822,2162)DertaultBlacklistFilter ++Attributel ++Operationl() ++Operation2() ++Operation3() ++Operation4() ++Operation5() ++Operation6() ++Operation7() ++Operation8() ++Operation9() ++Operation10() ++Operation11() ++Operation12() +@null@null@#(146,1766)PwElem +@+type: int ++value: String +@PwElem ++type: int ++value: String ++Pwelement() ++aetTvpe() +@#(946,1446)DefaultRegexEXxFilter +@+blacklist: List +@DefaultRegexEXxFilter ++blacklist: List ++DefaultRegexExFilter() ++addToBlackList() ++filter() ++getBlacklist() ++getDescription() ++getlD() ++removeFromBlacklist() ++setBlacklist() +@#(962,1462)DefaultRegexEXxFIiiter ++blacklist: List ++DefaultRegexExFilter() ++addToBlackList() +Hilter() ++getBlacklist() ++getDescription() ++getID() ++removeFromBlacklist() ++setBlacklist() ++setDescription() ++setlD() +@null@null@#(106,1146)Random Factory +@@Random Factory ++getAlgorithms() ++getinstance() ++getLogger() ++getProvider() ++getRandom() ++getSecureRandom() ++getServiceProvider() ++main() +@#(1886,986)PwGenerator +@+DefaultBlacklistFilter: IPassword ++DefaultPasswordFilter: IPassword ++LOGGER_CONFIG: String +@PwGenerator ++DefaultBlacklistFilter: IPassword ++DefaultPasswordFilter: IPassword ++LOGGER_CONFIG: String ++PwGenerator() ++addFilter() ++generatePassword() ++getDefaultBlacklist() ++DefaultPassword() ++main() ++print() ++printColumns() ++process() +@#(122,1162)Random Factory ++getAlgorithms() ++getinstance() ++getLogger() ++getProvider() ++getRandom() ++getSecureRandom() ++getServiceProvider() ++main() ++setLogger() +@null@null@#(762,1147)y +@null@null@#(746,66)IPwGenRegEX +@+REGEX_AT_LEAST 2 _DIGITS: String ++REGEX_AT_LEAST_2_DIGITS_FLAG: int ++REGEX_AT_LEAST 2 _DIGITS_SYMBOLS: String ++REGEX_AT_LEAST 2_DIGITS_SYMBOLS_FLAG: int ++REGEX_ENDS_NO_DIGIT: String ++REGEX_ENDS_NO_DIGIT_FLAG: int ++REGEX_ENDS_NO_SMALL_LETTER: String ++REGEX_ENDS_NO_SMALL_LETTER_FLAG: int ++REGEX_ENDS_NO_SYMBOL: String ++REGEX_ENDS_NO_SYMBOL_FLAG: int ++REGEX_ENDS_NO_UPPER_LETTER: String ++REGEX_ENDS_NO_UPPER_LETTER_FLAG: int ++REGEX_ONLY_1_CAPITAL: String ++REGEX_ONLY_1_CAPITAL_FLAG: int ++REGEX_ONLY_1_DIGIT: String ++REGEX_ONLY_1_DIGIT_FLAG: int ++REGEX_ONLY_1_DIGIT_SYMBOL: String ++REGEX_ONLY_1_DIGIT_SYMBOL_FLAG: int ++REGEX_STARTS_NO_DIGIT: String ++REGEX_STARTS_NO_DIGIT_FLAG: int ++REGEX_STARTS_NO_SMALL_LETTER: String ++REGEX_STARTS_NO_SMALL_LETTER_FLAG: int ++REGEX_STARTS_NO_SYMBOL: String ++REGEX_STARTS_NO_SYMBOL_FLAG: int ++REGEX_STARTS_NO_UPPER_LETTER: String ++REGEX_STARTS_NO_UPPER_LETTER_FLAG: int +@IPwGenRegEX +@#(1902,1002)PwGenerator ++DefaultBlacklistFilter: IPassword ++DefaultPasswordFilter: IPassword ++LOGGER_CONFIG: String ++PwGenerator() ++addFilter() ++generatePassword() ++getDefaultBlacklist() ++DefaultPassword() ++main() ++print() ++printColumns() ~ ++process() ++removeFilter() ++setDefaultBlacklist() ++setDefaultBlacklist() ++setLogLevel() +@null@null@#(42,789)} +@null@null@#(1911,734): y +@null@null@#(1742,734)S +@null@null@#(1726,66)IPwGenConstants +@+CONSTANT: int ++DEFAULT_NO_COLUMS: boolean ++DEFAULT_NUMBER_OF_COLUMS: int ++DEFAULT_NUMBER_OF_PASSWORDS: int ++DEFAULT_PASSWORD_LENGTH: int ++DEFAULT_TEAM_WIDTH: int ++DIPTHONG: int + ++NOT_FIRST: int + ++PW_AMBIGUOUS: int ++PW_AMBIGUOUS_SYMBOLS: String ++PW_DIGITS: int ++PW_SPECIAL_SYMBOLS: String ++PW_SYMBOLS: int + ++PW_UPPERS: int + ++VOWEL: int +@IPwGenConstants +@#(26,126)IRandomFactory +@+ALG_DEFALUT: String ++ALG_PARSE_STRING: String ++ALG_SHA1PRNG: String ++PROVIDER_DEFAULT: String ++PROVIDEER_SOFTWARE: String ++PRODIVER_SUN: String ++PROVIDER_RANDOM: String ++TYPE_SECURE_RANDOM: String +@IRandomFactory ++ALG_DEFALUT: String ++ALG_PARSE_STRING: String ++ALG_SHA1PRNG: String ++PROVIDER_DEFAULT: String ++PROVIDEER_SOFTWARE: String ++PRODIVER_SUN: String +@#(300,142)\Factory + +String + +‘RING: String + +5: String + +-AULT: String +DFTWARE: String +\: String + +NDOM: String +_RANDOM: String +m() + +er() +@null@null@#(2112,82)stants + +5: boolean + +- COLUMS: int + +- PASSWORDS: int +LENGTH: int + +H: int + +BOLS: String + +S: String +@null@null@#(2642,42)IPwGenCommandLineOptions ++Attributel ++Attribute2 ++Attribute3 ++Attribute4 ++Attribute5 ++Attribute6 ++Attribute7 ++Attribute8 ++Attribute9 ++Attribute10 ++Attribute11 ++Attribute12 ++Attribute13 ++Attribute14 ++Attribute15 ++Attribute 16 ++Attributel7 ++Attribute18 ++Attribute19 ++Attribute20 ++Attribute21 ++Attribute22 ++Attribute23 ++Attribute24 ++Attribute25 ++Attribute26 ++Attribute27 ++Attribute28 ++Attribute29 ++Attribute30 ++Attribute31 ++Attribute32 ++Attribute33 ++Attribute34 ++Attribute35 ++Attribute36 ++Attribute37 ++Attribute38 ++Attribute39 ++Attribute40 ++Attribute41 ++Attribute42 ++Attribute43 ++Attribute44 ++Attribute45 ++Attribute46 ++Attribute47 ++Attribute48 ++Attribute49 ++Attribute50 ++Attribute51 ++Attribute52 ++Attribute53 ++Attribute54 ++Attribute55 ++Attribute56 ++Attribute57 ++Attribute58 ++Attribute59 ++Attribute60 ++Attribute61 ++Attribute62 ++Attribute63 ++Attribute64 ++Attribute65 ++Attribute66 ++Attribute67 ++Attribute68 ++Attribute69 ++Attribute70 ++Attribute71 ++Attribute72 ++Attribute73 ++Attribute74 ++Attribute75 ++Attribute76 ++Attribute77 ++Attribute78 ++Attribute79 ++Attribute80 ++Attribute81 ++Attribute82 ++Attribute83 ++Attribute84 ++Attribute85 +@null@null@# \ No newline at end of file diff --git a/src/main/resources/cd/C204-242-DJSMT_Assignment-1.txt b/src/main/resources/cd/C204-242-DJSMT_Assignment-1.txt index 7340dafbb671c2cd9306e2979bd17f118eada256..eb41a118bb228afdc7cc17c24c229603f218abd2 100644 --- a/src/main/resources/cd/C204-242-DJSMT_Assignment-1.txt +++ b/src/main/resources/cd/C204-242-DJSMT_Assignment-1.txt @@ -1,83 +1,36 @@ -<> -ScanEvents -@+takeFromVehicle -+addToVehicle -@@Scan -%<> -ScanEvents -%依赖￥#<> -Employee Roles -@+sorter -@R -@Employeee -%<> -Employee Roles -%依赖￥#Employeee -@+role -@@Employeee -%<> -Employee Roles -%依赖￥SorterSession -%Employeee -%实现￥Scan -%Employeee -%依赖￥DataAdapter -%Employeee -%依赖￥#PackageBin -@+destinationCities -+scantistory -+scan -@+addPackage() -+ostring() -+lastScan() +(1566,966)ScanEvents +@+Attributel ++Attribute2 +@ScanEvents +@#(946,986)Employee +@+Attributel +@Employee +@#(266,986)Employee Roles +@+Attributel +@Employee Roles +@#(547,1002)@null@null@#(562,662)N\ +@null@null@#(1602,577)@null@null@#(26,486)SoterZSession +@SoterZSession +@@#(1106,366)PackageBin +@+Attributel ++Attribute2 ++Attribute3 @PackageBin -%Scan -%实现￥#Scan -@+event ++Attributel ++Attribute2 +@#(1586,466)Scan @@Scan -%Employeee -%依赖￥Scan -%<> -ScanEvents -%依赖￥PackageBin -%Scan -%实现￥Package -%Scan -%实现￥#DataAdapter -@— =2 -@+getAllPackage() -+getallBin() - -+addBin() -+getundeliveredPackages() -@DataAdapter -%Employeee -%依赖￥DataAdapter -%SorterSession -%实现￥LoginForm -%DataAdapter -%实现￥Package -%DataAdapter -%实现￥#SorterSession -@w— -@@SorterSession -%Employeee -%实现￥DataAdapter -%SorterSession -%实现￥LoginForm -%SorterSession -%实现￥#Package -@“+destinationCity -“+scanHistory -@+tostring() +@#(546,406)DataAdapter +@@DataAdapter ++Operation1() ++Operation2() ++0Onaratinn?2A\ +@#(792,437)- +@null@null@#(1352,382)@null@null@#(1142,239)N +@null@null@#(1126,26)Package +@+Attributel ++Attribute2 @Package -%Scan -%实现￥Package -%DataAdapter -%实现￥#LoginForm -@——— =~ +@#(566,66)LoginForm @@LoginForm -%SorterSession -%实现￥LoginForm -%DataAdapter -%实现￥#@null@null@# \ No newline at end of file +@# \ No newline at end of file diff --git a/src/main/resources/cd/abrden_StarCraft.txt b/src/main/resources/cd/abrden_StarCraft.txt index a7b85eb80727085270a2d3c13c3bd43b612530f0..ccf429481e44532e318a4357ba06f55d69168d35 100644 --- a/src/main/resources/cd/abrden_StarCraft.txt +++ b/src/main/resources/cd/abrden_StarCraft.txt @@ -1,53 +1,29 @@ -TerranBuilder -@@+TerranBuilder() -+getRace(): String -@#ProtossBuilder -@@+ProtossBuilder() -+getRace(): String -@#StructureTemplate -@@+create(position : Point) : Structure -@#Builder -@# dependsOn : Map = new HashMap() -@+ create(name : String, position : Point, resources : Resources, bl : terable, map : Map) : Construction -- getTemplateWithName(name : String) : StructureTemplate - -- structureRequiredExists(name : String, built - terable) : boolean - -#addTemplate(template : StructureTemplate) : void - -#addDependency(key : String, value : String) : void - -# dependensOn(key : String) : String - -+ getTemplateNames() : Stringl] - -+getRace() : String -@#TerranBuilder -@@+TerranBuilder() -+getRace(): String -@#ProtossBuilder -@@+ProtossBuilder() +(886,706)ProtossBuilder +@@ProtossBuilder ++DProtnceRIiildear() +@#(1526,686)TerranBuilder +@@TerranBuilder ++TarranRiildear) +@#(26,646)StructureTemplate +@StructureTemplate +I ++create(position: Point): Structure +@@#(1032,464)\ \ +@null@null@#(675,464)y y +@null@null@#(82,464)@null@null@#(66,26)Builder +@Builder ++create(name: String, position: Point, resouces: Resources, built: Iterable, map: Map): Construction +-getTemplateWithName(name: String): StructureTemplate +-structureRequiredExists(name: String, built: Iterable): boolean +#addTemplate(template: StructureTemplate): void +#addDependency(key: String, value: String): void +#dependensOn(key: String): String ++getTemplateNames(): String +getRace(): String -@#StructureTemplate -@@+create(position : Point) : Structure @Builder -%StructureTemplate -%依赖￥#Builder -@# dependsOn : Map = new HashMap() -@+ create(name : String, position : Point, resources : Resources, bl : terable, map : Map) : Construction -- getTemplateWithName(name : String) : StructureTemplate - -- structureRequiredExists(name : String, built - terable) : boolean - -#addTemplate(template : StructureTemplate) : void - -#addDependency(key : String, value : String) : void - -# dependensOn(key : String) : String - -+ getTemplateNames() : Stringl] - -+getRace() : String @Builder -%StructureTemplate -%依赖￥# \ No newline at end of file +%Builder +%继承￥Builder +%Builder +%继承￥#(1301,42), map: Map): Construction +@null@null@# \ No newline at end of file diff --git a/src/main/resources/cd/alexasahis_km2.txt b/src/main/resources/cd/alexasahis_km2.txt index 65ca3482772f1035b63e280b3a490a40b1dca9fc..791198b7f50a14bcde122e918bf092fe8756f963 100644 --- a/src/main/resources/cd/alexasahis_km2.txt +++ b/src/main/resources/cd/alexasahis_km2.txt @@ -1,155 +1,108 @@ -class Root Object -@@S -@class Root Object -%‘class ModuleObject -%依赖￥#class CodeObjectList < Array -@@+ #initialize -+ #push -@#class Proxy -@+ #namespace [R] -+ #name [R] -@= - -+it<=> - -== - -=== -+fclass - -+ #initialize - -+ #inspect - -+ #instance_of? -+ s a? -+#tkind of? - -+ f#metfod_missing -+#path - -+ #trespond to? -+#type - -+ ittype= -@#‘class ModuleObject -@S -@+ #inheritance tree -@‘class ModuleObject -%‘class NamespaceObject -%实现￥class Root Object -%‘class ModuleObject -%依赖￥#class ClassObject -@+ #superclass [RW] -@+ #inheritance_tree - -+ #inherited_constants -+ #inherited_meths - -+ #is_exception? +(86,2226)class RootObject +@class RootObject +@@#(766,2126)class Proxy +@+hamespace ++hame +@class Proxy ++namespace ++name ++class() ++initialize() ++inspect() ++instance_of() ++is_a() ++kind_of() ++method missina() +@#(782,2142)class Proxy ++namespace ++name ++class() ++initialize() ++inspect() ++instance_of() ++is_a() ++kind_of() ++method_missing() +tpath() ++respond_to() +ttype() +@null@null@#(82,1969)y +@null@null@#(66,1826)class ModuleObject +@class ModuleObject +. 0 0 00O ++inheritance_tree() +@@#(706,1726)class ClassObject +@+superclass @class ClassObject -%‘class NamespaceObject -%依赖￥#‘class NamespaceObject -@+ #children [R] - -+ #cvars [R] - -+ #meths [R] - -+ #constants [R] - -+ #attributes [R] - -+ #aliases [R] - -+ ifclass_mixins [R] - -} #instance mixins [R] -@+ #child - -+ #class_attributes - -+ #included constants -+ #included meths - -+ #instance_attributes -+ $mixing -@‘class NamespaceObject -%~ class Base -%依赖￥‘class ModuleObject -%‘class NamespaceObject -%实现￥class ClassObject -%‘class NamespaceObject -%依赖￥#‘class ClassVariableObject -@@@#class Constant Object -@+ #value [RW] -@@class Constant Object -%~ class Base -%依赖￥#‘class MethodObject -@+ #visibility [RW] - -+ ##scope [RW] - -+ texplicit [RW] - -+ #parameters [RW] -@+ #aliases - -+ #is_alias? -+#is_attribute? -+ #is_explicit? -@‘class MethodObject -%~ class Base -%依赖￥#\ -@null@null@\ -%~ class Base -%实现￥#~ class Base -@+ #name [R] - -+ #iles [R] - -+ f#tnamespace [RW] -+ #s0urce [RW] - -+ #signature (RW] -+ #docstring [RW] -+ #dynamic [RW] -@+=== - -+new - -== - -+#1) - -+#00= - -+#add file - -+ ftdynamic? - -+ #file String -+#has _tag? - -+ #initialize - -+ #tinspect - -+ #line : Fixnum -+ #method_missing -+#path - -+#ttag - -+#tags - -+ #type : Symbol -@class Constant Object -%~ class Base -%依赖￥‘class MethodObject -%~ class Base -%依赖￥\ -%~ class Base -%实现￥‘class NamespaceObject -%~ class Base -%依赖￥# \ No newline at end of file ++superclass ++inheritance_tree() ++inherited constants() +@#(1566,1546)class CodeObjectList +@@class CodeObjectList ++initializea\ +@#(42,1632)y +@null@null@#(26,1006)class NamespaceObject +@+children + ++cvars + ++meths ++constants ++attributes ++aliases ++class_mixins ++instance_mixins +@class NamespaceObject ++children + ++cvars + ++meths + ++constants + ++attributes +@#(1566,1206)class ConstantObject +@class ConstantObject +[ ] +@class ConstantObject +@#(786,1086)class MethodObject +@+visibility ++scope ++explicit ++parameters +@class MethodObject ++visibility + ++scope + ++explicit +@#(2206,1166)class ClassVariableObject +@class ClassVariableObject +@@#(433,1022), +@’ +@null@#(1511,42)@\ +N +@null@#(1186,26)class Base +@+name + ++file ++namespace ++source ++signature ++docString ++dynamic +@class Base ++name ++file ++namespace ++source ++signature ++docString ++dynamic ++new() ++add_file() ++dynamic() ++file(): String ++has taa() +@# \ No newline at end of file diff --git a/src/main/resources/cd/badqiu_rapid-framework.txt b/src/main/resources/cd/badqiu_rapid-framework.txt index f5acf042be6f4207d8f637a031413f239eb84814..e64ec9832598c9bb7a0eee9d8f35b4faf456fb24 100644 --- a/src/main/resources/cd/badqiu_rapid-framework.txt +++ b/src/main/resources/cd/badqiu_rapid-framework.txt @@ -1,28 +1,23 @@ -SqlFactory -@+ parsesal() : Sal -@null@GeneratorFacade -%SqlFactory -%实现￥#JavaClass -@@null@GeneratorFacade -%JavaClass -%实现￥#TableFactory -@+ getTable() : Table -@null@GeneratorFacade -%TableFactory -%实现￥#GeneratorFacade -@+ deleteByClass() : void -+ deleteBySql) : void - -+ deleteByTable() : void -+ generateByClass() : void -+ generateBySqll) : void -+ generateByTable() : void +(986,1006)JavaClass +@@JavaClass +@#(506,1006)SqlFactory +@@SqlFactory +@#(26,966)TableFactory +@@TableFactory +@#(1286,446)Generator +@@Generator ++0Onearatinn1 )\ +@#(486,386)GeneratorFacade @@GeneratorFacade -%JavaClass -%实现￥GeneratorFacade -%TableFactory -%实现￥GeneratorFacade -%SqlFactory -%实现￥#GeneratorProperties -@@null@#@null@null@#@null@null@#@null@null@#@null@null@#GeneratorControl -@null@null@# \ No newline at end of file ++Operation1() ++Operation2() ++Operation3() ++Operation4() ++0Onaratinn&N +@#(1262,157)y +@null@null@#(462,137)4 +@null@null@#(1246,46)GeneratorControl +@GeneratorControl +@@#(446,26)GeneratorPropoerties +@GeneratorPropoerties +@@# \ No newline at end of file diff --git a/src/main/resources/cd/bojoer_loadui.txt b/src/main/resources/cd/bojoer_loadui.txt index 5ccb06f263d1cefb8218a8810805c5f1afbfccde..46210e4b0d65b1b775841db7111329aba73013c9 100644 --- a/src/main/resources/cd/bojoer_loadui.txt +++ b/src/main/resources/cd/bojoer_loadui.txt @@ -1,106 +1,42 @@ -<> -@ DataPoint -@@ getTimestamp(): long -® getvalue(): T -@null@<> -@ statistic -%<> -@ DataPoint -%依赖￥#<> -@ statistic -@© gethame() - -© oetStatistcVariabie() -© getSource() - -© getperiod) - -© getperiod() - -© getTmestamp() - -@ getLatestPoint() -@null@<> -@ statistic -%<> -@ DataPoint -%依赖￥#< -© statisticVariable -@© getlame() - -© oetStatistcHolder() -© getSources() - -© getStatistctiames() -© getstatistcl) - -® getwriters() -@null@< -© statisticVariable -%<> -© statisticHolder -%实现￥< -© statisticsWriter -%< -© statisticVariable -%依赖￥< -© statisticsWriter -%< -© statisticVariable -%实现￥#< -© statisticsWriter -@© getvalueCount() - -© sefiinimumirteDelay() -© update) - -© fush) - -© output) - -© agoregate() - -© oetStatistcVariabie() -© gefTrackDescriptor() -© getType() -@null@< -© statisticsWriter -%< -© statisticVariable -%依赖￥< -© statisticsWriter -%< -© statisticVariable -%实现￥< -© statisticsWriter -%< -@ statisticsManager -%依赖￥#<> -© statisticHolder -@© getStatisticVariable() -@ getStatisticVariableNames() -@null@< -© statisticVariable -%<> -© statisticHolder -%实现￥< -@ statisticsManager -%<> -© statisticHolder -%依赖￥#< -@ statisticsManager -@© registerStatistictolder() -© deregiterstatiticHolder() -© getStatisticHolsers() - -© getiinmumitrteDelay() -@ getExecutionManager() -@null@< -@ statisticsManager -%<> -© statisticHolder -%依赖￥< -© statisticsWriter -%< -@ statisticsManager -%依赖￥# \ No newline at end of file +(866,1586)DataPoint +@@DataPoint ++0Onearatinn1 )\ +@#(866,1026)Statistics +@@Statistics ++Operation1() ++Operation2() ++Operation3() ++Operation4() ++Operation5() ++0Onearatinn&) +@#(842,857)y +@null@null@#(826,526)StatisticsVariable +@@StatisticsVariable ++Operation1() ++Operation2() ++Operation3() ++Operation4() ++0Onaratinn&N +@#(26,506)StatisticsWriter +@@StatisticsWriter ++Operation1() ++Operation2() ++Operation3() ++Operation4() ++Operation5() ++Operation6() ++Operation7() ++0OnaratinnQ\ +@#(301,522)Y +@null@null@#(42,319)y +@null@null@#(862,247)J +@null@null@#(846,66)StatisticsHolder +@@StatisticsHolder ++0Onearatinn1 )\ +@#(26,26)StatisicsManager +@@StatisicsManager ++Operation1() ++Operation2() ++Operation3() ++0OnaratinnA +@# \ No newline at end of file diff --git a/src/main/resources/cd/cd-BackupTheBerlios_jpwgen-svn.png b/src/main/resources/cd/cd-BackupTheBerlios_jpwgen-svn.png index ff7c6247a13ee5c44d9a60ac545559ff43fe4217..8bc0e8a2c4176cfc8503363825d4af379cf978ce 100644 Binary files a/src/main/resources/cd/cd-BackupTheBerlios_jpwgen-svn.png and b/src/main/resources/cd/cd-BackupTheBerlios_jpwgen-svn.png differ diff --git a/src/main/resources/cd/cd-C204-242-DJSMT_Assignment-1.jpg b/src/main/resources/cd/cd-C204-242-DJSMT_Assignment-1.jpg deleted file mode 100644 index 4b900513ed368d28229a724ecc79923493df335c..0000000000000000000000000000000000000000 Binary files a/src/main/resources/cd/cd-C204-242-DJSMT_Assignment-1.jpg and /dev/null differ diff --git a/src/main/resources/cd/cd-C204-242-DJSMT_Assignment-1.png b/src/main/resources/cd/cd-C204-242-DJSMT_Assignment-1.png new file mode 100644 index 0000000000000000000000000000000000000000..bc98bd433e872b6d0cf9cf7e395cf10cefdb6272 Binary files /dev/null and b/src/main/resources/cd/cd-C204-242-DJSMT_Assignment-1.png differ diff --git a/src/main/resources/cd/cd-abrden_StarCraft.png b/src/main/resources/cd/cd-abrden_StarCraft.png index 838e5a36003bc5c7641424d6db863c81b05a65ea..6b0525e8662e2b2b2a54933940abe8f7348aa8ee 100644 Binary files a/src/main/resources/cd/cd-abrden_StarCraft.png and b/src/main/resources/cd/cd-abrden_StarCraft.png differ diff --git a/src/main/resources/cd/cd-alexasahis_km2.png b/src/main/resources/cd/cd-alexasahis_km2.png index 055ebb5505e013e6777e4f6a6dafae8ef748c75a..be52fede069055baa214f212fa981e9bb8c3cea8 100644 Binary files a/src/main/resources/cd/cd-alexasahis_km2.png and b/src/main/resources/cd/cd-alexasahis_km2.png differ diff --git a/src/main/resources/cd/cd-badqiu_rapid-framework.jpg b/src/main/resources/cd/cd-badqiu_rapid-framework.jpg deleted file mode 100644 index 39ac27c3f264792b5af09c1b2453e56359c87549..0000000000000000000000000000000000000000 Binary files a/src/main/resources/cd/cd-badqiu_rapid-framework.jpg and /dev/null differ diff --git a/src/main/resources/cd/cd-badqiu_rapid-framework.png b/src/main/resources/cd/cd-badqiu_rapid-framework.png new file mode 100644 index 0000000000000000000000000000000000000000..612ad97aba5d9373af520b1adbeaef15343f410d Binary files /dev/null and b/src/main/resources/cd/cd-badqiu_rapid-framework.png differ diff --git a/src/main/resources/cd/cd-bojoer_loadui.png b/src/main/resources/cd/cd-bojoer_loadui.png index f30a1d4e1ab4c86f7aad2735fc93a3c83af2e5ff..eec452bc76f7e4d8cc69ef4bffd1f087ebc72fa5 100644 Binary files a/src/main/resources/cd/cd-bojoer_loadui.png and b/src/main/resources/cd/cd-bojoer_loadui.png differ diff --git a/src/main/resources/cd/cd-cscfa_bartleby.jpg b/src/main/resources/cd/cd-cscfa_bartleby.jpg deleted file mode 100644 index cb6578208bc56986a8d4e66a23f8a9709c7138a4..0000000000000000000000000000000000000000 Binary files a/src/main/resources/cd/cd-cscfa_bartleby.jpg and /dev/null differ diff --git a/src/main/resources/cd/cd-cscfa_bartleby.png b/src/main/resources/cd/cd-cscfa_bartleby.png new file mode 100644 index 0000000000000000000000000000000000000000..7a2f38c516ef05bb5bda65662b4eb4a9e918ebf4 Binary files /dev/null and b/src/main/resources/cd/cd-cscfa_bartleby.png differ diff --git a/src/main/resources/cd/cd-dsarlis_SoftEng.png b/src/main/resources/cd/cd-dsarlis_SoftEng.png index 36dcfb50b788eae112f47340c968cbc79cf7d857..09902b80b56e1f45229a17a58c5e748f868e31ad 100644 Binary files a/src/main/resources/cd/cd-dsarlis_SoftEng.png and b/src/main/resources/cd/cd-dsarlis_SoftEng.png differ diff --git a/src/main/resources/cd/cd-egoless_pqs.png b/src/main/resources/cd/cd-egoless_pqs.png index c03a01b83263990836df45c5b0ffc304cdd37feb..1b6cbb3a3e82086fd364ca4a63107d8f8ab5a6d5 100644 Binary files a/src/main/resources/cd/cd-egoless_pqs.png and b/src/main/resources/cd/cd-egoless_pqs.png differ diff --git a/src/main/resources/cd/cd-emeric254_Java-STRI-S4.png b/src/main/resources/cd/cd-emeric254_Java-STRI-S4.png index 90b238e8d8a6c5b760ccea6ebcc988e3436dd83e..a2bfb2faad38ff756130304df47defb0b979d15a 100644 Binary files a/src/main/resources/cd/cd-emeric254_Java-STRI-S4.png and b/src/main/resources/cd/cd-emeric254_Java-STRI-S4.png differ diff --git a/src/main/resources/cd/cscfa_bartleby.txt b/src/main/resources/cd/cscfa_bartleby.txt index ba694bdf2381eb958fcf39274d09ddcf33d043e7..5daf9ee1f0bf41c1ec285d7e3910f58568429179 100644 --- a/src/main/resources/cd/cscfa_bartleby.txt +++ b/src/main/resources/cd/cscfa_bartleby.txt @@ -1,81 +1,44 @@ -RollingFileAppender -@#setRolingPoiicy RollngPolicy): void -+setTriggeringPolcy (TriggeringPolicy ) -@null@#FileAppender -@+setFile(String): void. -+setPrudentlooolean): void -+setAppend(boolean): void +(1126,1666)RollingFileAppender +@@RollingFileAppender ++0Onearatinn1 )\ +@#(1202,1444)y +@null@null@#(1186,1226)FileAppender @@FileAppender -%‘OutputStreamAppender -%实现￥#‘ConsoleAppender -@+setTarget(String): void -@@‘ConsoleAppender -%‘OutputStreamAppender -%实现￥#Filter -@+decide(E event): FilterReply -@null@Filter -%‘OutputStreamAppender -%实现￥#<> -Encoder -@#init{OutputStream): void -+doEncode(E event): void -+cose(): void -@null@#‘OutputStreamAppender -@+setOutputStream(OutputStream): void -4setEncoder Encoder ): void -@null@FileAppender -%‘OutputStreamAppender -%实现￥‘ConsoleAppender -%‘OutputStreamAppender -%实现￥Filter -%‘OutputStreamAppender -%实现￥#UnsynchronizedAppenderBase -@+doAppend(E event): void ++Operation1() ++0Onaratinn?2(\ +@#(146,1186)ConsoleAppender +@ConsoleAppender +000000 ++Operation1() +@@#(623,1007)/ +@null@null@#(26,846)Filter +@@Filter +@#(546,826)OutPutStreamAppender +@OutPutStreamAppender +0 0000000000001 ++Operation1() ++Operation2() +@@#(490,914)@null@null@#(1366,806)Encoder +@@Encoder ++Operation1() ++0Onaratinn?2(\ +@#(272,862)@null@null@#(965,842)@null@null@#(502,582)y +@null@null@#(486,326)UnSynchronizedAppenderBase +@UnSynchronizedAppenderBase +0000000000000 -#append(E event): void -+addFiter Fiter <> fiter): void -+getFierChainDeciion(E event): FiterReply -@@#<> -Appender -@“+doAppend(E event): void -@@#RollingFileAppender -@#setRolingPoiicy RollngPolicy): void -+setTriggeringPolcy (TriggeringPolicy ) -@null@#FileAppender -@+setFile(String): void. -+setPrudentlooolean): void -+setAppend(boolean): void -@@FileAppender -%‘OutputStreamAppender -%实现￥#‘ConsoleAppender -@+setTarget(String): void -@@‘ConsoleAppender -%‘OutputStreamAppender -%实现￥#Filter -@+decide(E event): FilterReply -@null@Filter -%‘OutputStreamAppender -%实现￥#<> -Encoder -@#init{OutputStream): void -+doEncode(E event): void -+cose(): void -@null@#‘OutputStreamAppender -@+setOutputStream(OutputStream): void -4setEncoder Encoder ): void -@null@FileAppender -%‘OutputStreamAppender -%实现￥‘ConsoleAppender -%‘OutputStreamAppender -%实现￥Filter -%‘OutputStreamAppender -%实现￥#UnsynchronizedAppenderBase -@+doAppend(E event): void ++Operation1() + ++Operation2() + ++Operation3() -#append(E event): void -+addFiter Fiter <> fiter): void -+getFierChainDeciion(E event): FiterReply -@@#<> -Appender -@“+doAppend(E event): void -@@# \ No newline at end of file ++Operation4() +@@UnSynchronizedAppenderBase +%UnSynchronizedAppenderBase +%继承￥UnSynchronizedAppenderBase +%UnSynchronizedAppenderBase +%继承￥#(662,169)J +@null@null@#(646,26)Appender +@@Appender +@# \ No newline at end of file diff --git a/src/main/resources/cd/dsarlis_SoftEng.txt b/src/main/resources/cd/dsarlis_SoftEng.txt index 941fd8bd78bbcbf29899dd69811db7918d56a6a0..0e7f13d0f8a423c6b6a3668c0a58c204ac485db9 100644 --- a/src/main/resources/cd/dsarlis_SoftEng.txt +++ b/src/main/resources/cd/dsarlis_SoftEng.txt @@ -1,65 +1,58 @@ -ConcreteBehaviorB2 -@@+ action20 void -@ConcreteBehaviorB2 -%=> -BehaviorB -%实现￥#ConcreteBehaviorB1 -@@+ action20 void -@ConcreteBehaviorB1 -%=> -BehaviorB -%实现￥#=> -BehaviorB -@@+ action2() : void -@ConcreteBehaviorB1 -%=> -BehaviorB -%实现￥ConcreteBehaviorB2 -%=> -BehaviorB -%实现￥Client -%=> -BehaviorB -%依赖￥#Subclass2 -@@@Client -%Subclass2 -%依赖￥#Subclass 1 -@@@Subclass 1 -%Client -%依赖￥#ConcreteBehaviorA1 -@@+ action1 0 void -@ConcreteBehaviorA1 -%=> -Behavior -%实现￥#ConcreteBehaviorA2 -@@+ action1 0 void -@ConcreteBehaviorA2 -%=> -Behavior -%实现￥#Client -@@+ doAction( : void -+ doActionB( - void -@Client -%=> -BehaviorB -%依赖￥Client -%Subclass2 -%依赖￥Client -%=> -Behavior -%依赖￥Subclass 1 -%Client -%依赖￥#e -@null@null@#=> -Behavior -@@+ actiont() : void -@ConcreteBehaviorA1 -%=> -Behavior -%实现￥ConcreteBehaviorA2 -%=> -Behavior -%实现￥Client -%=> -Behavior -%依赖￥# \ No newline at end of file +(926,1546)ProxycCall +@+Attributel ++Attribute2 ++Attribute3 ++Attribute4 +@ProxycCall ++Attributel +@#(2026,1586)CallEnd +@@CallEnd +@#(1566,1586)CallStart +@@CallStart +@#(1849,1262)@null@null@#(1782,1262)-/ +@null@null@#(1766,1086)Observer +@+Attributel +@Observer +@#(926,986)Proxy +@+Attributel ++Attribute2 +@Proxy ++Attributel ++Attribute2 ++Operation1() ++Operation?2() +@#(26,1046)Policy +@@Policy +@#(1172,1002)/ +@@null@#(1202,737)/ +@null@null@#(602,719)\ +@null@null@#(1806,506)TimeServer +@+Attributel +@TimeServer ++Attributel ++Operation1() +@#(586,506)BlockingServer +@+Attributel +@BlockingServer ++Attributel +@#(26,426)BillingServer +@+Attributel ++Attribute2 ++Attribute3 +@BillingServer ++Attributel ++Attribute2 ++Attribute3 +@#(1186,486)ForawardingServer +@+Attributel +@ForawardingServer ++Attributel ++Operation1() +@#(272,442)» +@- +@null@#(923,239)@null@null@#(862,239)S +@null@null@#(846,26)DataBaseServer +@+Attributel +@DataBaseServer ++Attributel +@#(1126,42)@null@null@# \ No newline at end of file diff --git a/src/main/resources/cd/egoless_pqs.txt b/src/main/resources/cd/egoless_pqs.txt index 04d138f99dcf91a470655a74ba81f0ee734bf169..f8b6037f1753ade1a459ed7b4c5e955cae30021c 100644 --- a/src/main/resources/cd/egoless_pqs.txt +++ b/src/main/resources/cd/egoless_pqs.txt @@ -1,151 +1,83 @@ -Contact +(26,1426)Contact +@+Attributel ++Attribute2 ++Attribute3 ++Attribute4 ++Attribute5 ++Attribute6 ++Attribute7 ++Attribute8 @Contact -“id-ong - -- street string - -. cap:string - -- oty :string - -- province strng - -- mainPhone string - -- secondaryPhone string -- fax: string -@- id:long - -- street string - -- cap:string - -- cty:string - -- province - string - -- mainPhone :string - -- secondaryPhone :string -- fax - string -@Contact -%Nation -%依赖￥#Teacher -@_Teacher - hirngbate - sate -@- hiringDate : date -@#Subject +@#(546,1386)Teacher +@+Attributel +@Teacher +@#(1426,1346)Subject +@+Attributel ++Attribute2 @Subject -“a:long -- name :string -@- id:long -- name : string -@#Nation -@- id:long -- name : string -@@Contact -%Nation -%依赖￥#Absence -@- id:long - -- start: date - -- end: date - -- Justified - bool -- notes:string -- extra: Extra -@@AbsenceType -%Absence -%依赖￥#AbsenceType -@AbsenceType -~a:long -- description : string -@- id:long -- description string -@AbsenceType -%Absence -%依赖￥#Person -@- id:long - -- exra: Exra - -- name :string - -- sumame : string - -- bithDate : date - -- fiscalCode : string - -- hasHandicap : bool - -- residenceContact : Contact -- addressContact : Contact -@@Religion -%Person -%依赖￥Student -%Person -%实现￥#RaitingType -@RaitingType -“a:long -- description : string -@- id:long -- description string -@#Student -@~ subscriptonDate| flutel -@- subscriptionDate : date -@Student -%Raiting -%依赖￥Student -%Classroom -%依赖￥Student -%Person -%实现￥Parent -%Student -%依赖￥#Raiting -@Raiting -“id-ong - -- date: date -- value :int -- extra: Extra -@- id:long - -- date:date. -- value it -- extra: Extra -@Raiting -%Raiting -%实现￥Student -%Raiting -%依赖￥Raiting -%Raiting -%实现￥#Classroom -@Classroom -“id-ong - -- number it - -- secton string -. extra: Extra -@- id:long - -- number: it - -- secton :string -- extra: Extra +@#(727,1402)@null@null@#(42,1227)@null@null@#(26,1046)Nation +@+Attributel ++Attribute2 +@Nation +@#(666,846)Absnece +@+Attributel ++Attribute2 ++Attribute3 ++Attribute4 ++Attribute5 ++Attribute6 +@Absnece +@#(1086,926)AbsnceType +@+Attributel ++Attribute2 +@AbsnceType +@#(1846,826)RatingType +@+Attributel ++Attribute2 +@RatingType +@#(847,862)@null@null@#(26,406)Person +@+Attributel ++Attribute2 ++Attribute3 ++Attribute4 ++Attribute5 ++Attribute6 ++Attribute7 ++Attribute8 ++Attribute9 +@Person +@Person +%/ +%实现￥#(1442,702)@null@null@#(1426,446)Ratine +@+Attributel ++Attribute2 ++Attribute3 ++Attribute4 +@Ratine +@#(207,422)/ +@» +@L +@Person +%/ +%实现￥#(666,486)Student +@+Attributel @Student -%Classroom -%依赖￥#Extra -@— -@@#Parent -@@@Parent -%Student -%依赖￥#Religion -@- id:long -- name : string -@@Religion -%Person -%依赖￥#‘nu.mine.egoless.didactic -@null@null@# \ No newline at end of file +@#(847,502)@null@null@#(1607,462)~ +@null@null@#(1206,106)ClassRoom +@+Attributel ++Attribute2 ++Attribute3 ++Attribute4 +@ClassRoom +@#(1726,206)Extra +@@Extra +@#(1159,294)y 4 +@@null@#(722,237)J +@null@null@#(706,126)Parent +@@Parent +@#(42,207)y +@null@null@#(26,26)Religion +@+Attributel ++Attribute2 +@Religion +@# \ No newline at end of file diff --git a/src/main/resources/cd/emeric254_Java-STRI-S4.txt b/src/main/resources/cd/emeric254_Java-STRI-S4.txt index e46d778e64b1a50ba830a88361e037b85671192d..8aa5a8d1dcc3da0dcc342fc323155af156f291b6 100644 --- a/src/main/resources/cd/emeric254_Java-STRI-S4.txt +++ b/src/main/resources/cd/emeric254_Java-STRI-S4.txt @@ -1,175 +1,233 @@ -sdo:DataFeed -@sdo:dataFeedElement -@null@sdo:DataFeed -%sdo:Dataset -%实现￥#sdo:Dataset -@sdo:distribution -“dctincludedinDataCatlos -“doimessurementTchniaus -“donvarisblaMessured -sdoCreativeWork -“dcrabout -“dorsceountablzperson -“dorsssacistedisdia -“doscontributar -“doicreator -- -=dodztentoditied -=dodstepuslizned -Sdo-encodingFormat -donaspart -sdoinLanguage -Sdoispanor -Sdokeywords -sdolicenze -Sdopublsher -sdospatialCoverage -SdotemporaiCoversge -sdo:Thing -“coadditionsiType -o description -sdoidentifier -Zdoname -sdosubjector -