Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit1d6d0c5

Browse files
author
Chandana Amarnath
committed
pom.xml Fixed Conflict
2 parents1387e2b +faa29f8 commit1d6d0c5

File tree

1,074 files changed

+3703
-2830
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,074 files changed

+3703
-2830
lines changed

‎_scripts/postPumlsToServer.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#
22
# The MIT License
3-
# Copyright (c) 2014 Ilkka Seppälä
3+
# Copyright (c) 2014-2016 Ilkka Seppälä
44
#
55
# Permission is hereby granted, free of charge, to any person obtaining a copy
66
# of this software and associated documentation files (the "Software"), to deal
Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,29 @@
11
@startuml
22
packagecom.iluwatar.abstractdocument.domain {
3-
classPart {
4-
+Part(properties : Map<String, Object>)
3+
classCar {
4+
+Car(properties : Map<String, Object>)
55
}
6-
interfaceHasPrice {
6+
interfaceHasModel {
77
+PROPERTY :String {static}
8-
+getPrice() :Optional<Number>
8+
+getModel() :Optional<String>
99
}
1010
interfaceHasParts {
1111
+PROPERTY :String {static}
1212
+getParts() :Stream<Part>
1313
}
14-
classCar {
15-
+Car(properties : Map<String, Object>)
14+
interfaceHasPrice {
15+
+PROPERTY :String {static}
16+
+getPrice() :Optional<Number>
1617
}
1718
interfaceHasType {
1819
+PROPERTY :String {static}
1920
+getType() :Optional<String>
2021
}
21-
interfaceHasModel {
22-
+PROPERTY :String {static}
23-
+getModel() :Optional<String>
22+
classPart {
23+
+Part(properties : Map<String, Object>)
2424
}
2525
}
2626
packagecom.iluwatar.abstractdocument {
27-
classApp {
28-
+App()
29-
+main(args : String[]) {static}
30-
}
3127
abstract classAbstractDocument {
3228
-properties : Map<String, Object>
3329
#AbstractDocument(properties : Map<String, Object>)
@@ -36,24 +32,28 @@ package com.iluwatar.abstractdocument {
3632
+put(key : String, value : Object)
3733
+toString() :String
3834
}
35+
classApp {
36+
-LOGGER : Logger {static}
37+
+App()
38+
+main(args : String[]) {static}
39+
}
3940
interfaceDocument {
4041
+children(String,Function<Map<String,Object>,T>) :Stream<T> {abstract}
4142
+get(String) :Object {abstract}
4243
+put(String,Object) {abstract}
4344
}
4445
}
45-
AbstractDocument--+Map
46-
Part..|>HasType
47-
Part..|>HasModel
48-
Part..|>HasPrice
49-
Part--|>AbstractDocument
5046
AbstractDocument..|>Document
51-
HasPrice--|>Document
52-
HasParts--|>Document
5347
Car..|>HasModel
5448
Car..|>HasPrice
5549
Car..|>HasParts
5650
Car--|>AbstractDocument
57-
HasType--|>Document
5851
HasModel--|>Document
52+
HasParts--|>Document
53+
HasPrice--|>Document
54+
HasType--|>Document
55+
Part..|>HasType
56+
Part..|>HasModel
57+
Part..|>HasPrice
58+
Part--|>AbstractDocument
5959
@enduml

‎abstract-document/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<!--
33
44
The MIT License
5-
Copyright (c) 2014 Ilkka Seppälä
5+
Copyright (c) 2014-2016 Ilkka Seppälä
66
77
Permission is hereby granted, free of charge, to any person obtaining a copy
88
of this software and associated documentation files (the "Software"), to deal

‎abstract-document/src/main/java/com/iluwatar/abstractdocument/AbstractDocument.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/**
22
* The MIT License
3-
* Copyright (c) 2014 Ilkka Seppälä
3+
* Copyright (c) 2014-2016 Ilkka Seppälä
44
* <p>
55
* Permission is hereby granted, free of charge, to any person obtaining a copy
66
* of this software and associated documentation files (the "Software"), to deal

‎abstract-document/src/main/java/com/iluwatar/abstractdocument/App.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/**
22
* The MIT License
3-
* Copyright (c) 2014 Ilkka Seppälä
3+
* Copyright (c) 2014-2016 Ilkka Seppälä
44
* <p>
55
* Permission is hereby granted, free of charge, to any person obtaining a copy
66
* of this software and associated documentation files (the "Software"), to deal

‎abstract-document/src/main/java/com/iluwatar/abstractdocument/Document.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/**
22
* The MIT License
3-
* Copyright (c) 2014 Ilkka Seppälä
3+
* Copyright (c) 2014-2016 Ilkka Seppälä
44
* <p>
55
* Permission is hereby granted, free of charge, to any person obtaining a copy
66
* of this software and associated documentation files (the "Software"), to deal

‎abstract-document/src/main/java/com/iluwatar/abstractdocument/domain/Car.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/**
22
* The MIT License
3-
* Copyright (c) 2014 Ilkka Seppälä
3+
* Copyright (c) 2014-2016 Ilkka Seppälä
44
* <p>
55
* Permission is hereby granted, free of charge, to any person obtaining a copy
66
* of this software and associated documentation files (the "Software"), to deal

‎abstract-document/src/main/java/com/iluwatar/abstractdocument/domain/HasModel.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/**
22
* The MIT License
3-
* Copyright (c) 2014 Ilkka Seppälä
3+
* Copyright (c) 2014-2016 Ilkka Seppälä
44
* <p>
55
* Permission is hereby granted, free of charge, to any person obtaining a copy
66
* of this software and associated documentation files (the "Software"), to deal

‎abstract-document/src/main/java/com/iluwatar/abstractdocument/domain/HasParts.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/**
22
* The MIT License
3-
* Copyright (c) 2014 Ilkka Seppälä
3+
* Copyright (c) 2014-2016 Ilkka Seppälä
44
* <p>
55
* Permission is hereby granted, free of charge, to any person obtaining a copy
66
* of this software and associated documentation files (the "Software"), to deal

‎abstract-document/src/main/java/com/iluwatar/abstractdocument/domain/HasPrice.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/**
22
* The MIT License
3-
* Copyright (c) 2014 Ilkka Seppälä
3+
* Copyright (c) 2014-2016 Ilkka Seppälä
44
* <p>
55
* Permission is hereby granted, free of charge, to any person obtaining a copy
66
* of this software and associated documentation files (the "Software"), to deal

‎abstract-document/src/main/java/com/iluwatar/abstractdocument/domain/HasType.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/**
22
* The MIT License
3-
* Copyright (c) 2014 Ilkka Seppälä
3+
* Copyright (c) 2014-2016 Ilkka Seppälä
44
* <p>
55
* Permission is hereby granted, free of charge, to any person obtaining a copy
66
* of this software and associated documentation files (the "Software"), to deal

‎abstract-document/src/main/java/com/iluwatar/abstractdocument/domain/Part.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/**
22
* The MIT License
3-
* Copyright (c) 2014 Ilkka Seppälä
3+
* Copyright (c) 2014-2016 Ilkka Seppälä
44
* <p>
55
* Permission is hereby granted, free of charge, to any person obtaining a copy
66
* of this software and associated documentation files (the "Software"), to deal

‎abstract-document/src/test/java/com/iluwatar/abstractdocument/AbstractDocumentTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/**
22
* The MIT License
3-
* Copyright (c) 2014 Ilkka Seppälä
3+
* Copyright (c) 2014-2016 Ilkka Seppälä
44
* <p>
55
* Permission is hereby granted, free of charge, to any person obtaining a copy
66
* of this software and associated documentation files (the "Software"), to deal

‎abstract-document/src/test/java/com/iluwatar/abstractdocument/AppTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/**
22
* The MIT License
3-
* Copyright (c) 2014 Ilkka Seppälä
3+
* Copyright (c) 2014-2016 Ilkka Seppälä
44
* <p>
55
* Permission is hereby granted, free of charge, to any person obtaining a copy
66
* of this software and associated documentation files (the "Software"), to deal

‎abstract-document/src/test/java/com/iluwatar/abstractdocument/DomainTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/**
22
* The MIT License
3-
* Copyright (c) 2014 Ilkka Seppälä
3+
* Copyright (c) 2014-2016 Ilkka Seppälä
44
* <p>
55
* Permission is hereby granted, free of charge, to any person obtaining a copy
66
* of this software and associated documentation files (the "Software"), to deal
Lines changed: 33 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
@startuml
22
packagecom.iluwatar.abstractfactory {
33
classApp {
4+
-LOGGER : Logger {static}
45
-army :Army
56
-castle :Castle
67
-king :King
@@ -17,58 +18,58 @@ package com.iluwatar.abstractfactory {
1718
-setCastle(castle : Castle)
1819
-setKing(king : King)
1920
}
20-
classOrcKingdomFactory {
21-
+OrcKingdomFactory()
22-
+createArmy() :Army
23-
+createCastle() :Castle
24-
+createKing() :King
21+
interfaceArmy {
22+
+getDescription() :String {abstract}
23+
}
24+
interfaceCastle {
25+
+getDescription() :String {abstract}
26+
}
27+
classElfArmy {
28+
~DESCRIPTION : String {static}
29+
+ElfArmy()
30+
+getDescription() :String
2531
}
2632
classElfCastle {
2733
~DESCRIPTION : String {static}
2834
+ElfCastle()
2935
+getDescription() :String
3036
}
31-
classOrcCastle {
37+
classElfKing {
3238
~DESCRIPTION : String {static}
33-
+OrcCastle()
39+
+ElfKing()
3440
+getDescription() :String
3541
}
42+
classElfKingdomFactory {
43+
+ElfKingdomFactory()
44+
+createArmy() :Army
45+
+createCastle() :Castle
46+
+createKing() :King
47+
}
48+
interfaceKing {
49+
+getDescription() :String {abstract}
50+
}
3651
interfaceKingdomFactory {
3752
+createArmy() :Army {abstract}
3853
+createCastle() :Castle {abstract}
3954
+createKing() :King {abstract}
4055
}
41-
classElfKing {
56+
classOrcArmy {
4257
~DESCRIPTION : String {static}
43-
+ElfKing()
58+
+OrcArmy()
4459
+getDescription() :String
4560
}
46-
classElfArmy {
61+
classOrcCastle {
4762
~DESCRIPTION : String {static}
48-
+ElfArmy()
63+
+OrcCastle()
4964
+getDescription() :String
5065
}
51-
interfaceCastle {
52-
+getDescription() :String {abstract}
53-
}
54-
interfaceArmy {
55-
+getDescription() :String {abstract}
56-
}
5766
classOrcKing {
5867
~DESCRIPTION : String {static}
5968
+OrcKing()
6069
+getDescription() :String
6170
}
62-
classOrcArmy {
63-
~DESCRIPTION : String {static}
64-
+OrcArmy()
65-
+getDescription() :String
66-
}
67-
interfaceKing {
68-
+getDescription() :String {abstract}
69-
}
70-
classElfKingdomFactory {
71-
+ElfKingdomFactory()
71+
classOrcKingdomFactory {
72+
+OrcKingdomFactory()
7273
+createArmy() :Army
7374
+createCastle() :Castle
7475
+createKing() :King
@@ -77,12 +78,12 @@ package com.iluwatar.abstractfactory {
7778
App--> "-castle"Castle
7879
App--> "-king"King
7980
App--> "-army"Army
80-
OrcKingdomFactory..|>KingdomFactory
81+
ElfArmy..|>Army
8182
ElfCastle..|>Castle
82-
OrcCastle..|>Castle
8383
ElfKing..|>King
84-
ElfArmy..|>Army
85-
OrcKing..|>King
86-
OrcArmy..|>Army
8784
ElfKingdomFactory..|>KingdomFactory
85+
OrcArmy..|>Army
86+
OrcCastle..|>Castle
87+
OrcKing..|>King
88+
OrcKingdomFactory..|>KingdomFactory
8889
@enduml

‎abstract-factory/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<!--
33
44
The MIT License
5-
Copyright (c) 2014 Ilkka Seppälä
5+
Copyright (c) 2014-2016 Ilkka Seppälä
66
77
Permission is hereby granted, free of charge, to any person obtaining a copy
88
of this software and associated documentation files (the "Software"), to deal

‎abstract-factory/src/main/java/com/iluwatar/abstractfactory/App.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/**
22
* The MIT License
3-
* Copyright (c) 2014 Ilkka Seppälä
3+
* Copyright (c) 2014-2016 Ilkka Seppälä
44
*
55
* Permission is hereby granted, free of charge, to any person obtaining a copy
66
* of this software and associated documentation files (the "Software"), to deal

‎abstract-factory/src/main/java/com/iluwatar/abstractfactory/Army.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/**
22
* The MIT License
3-
* Copyright (c) 2014 Ilkka Seppälä
3+
* Copyright (c) 2014-2016 Ilkka Seppälä
44
*
55
* Permission is hereby granted, free of charge, to any person obtaining a copy
66
* of this software and associated documentation files (the "Software"), to deal

‎abstract-factory/src/main/java/com/iluwatar/abstractfactory/Castle.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/**
22
* The MIT License
3-
* Copyright (c) 2014 Ilkka Seppälä
3+
* Copyright (c) 2014-2016 Ilkka Seppälä
44
*
55
* Permission is hereby granted, free of charge, to any person obtaining a copy
66
* of this software and associated documentation files (the "Software"), to deal

‎abstract-factory/src/main/java/com/iluwatar/abstractfactory/ElfArmy.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/**
22
* The MIT License
3-
* Copyright (c) 2014 Ilkka Seppälä
3+
* Copyright (c) 2014-2016 Ilkka Seppälä
44
*
55
* Permission is hereby granted, free of charge, to any person obtaining a copy
66
* of this software and associated documentation files (the "Software"), to deal

‎abstract-factory/src/main/java/com/iluwatar/abstractfactory/ElfCastle.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/**
22
* The MIT License
3-
* Copyright (c) 2014 Ilkka Seppälä
3+
* Copyright (c) 2014-2016 Ilkka Seppälä
44
*
55
* Permission is hereby granted, free of charge, to any person obtaining a copy
66
* of this software and associated documentation files (the "Software"), to deal

‎abstract-factory/src/main/java/com/iluwatar/abstractfactory/ElfKing.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/**
22
* The MIT License
3-
* Copyright (c) 2014 Ilkka Seppälä
3+
* Copyright (c) 2014-2016 Ilkka Seppälä
44
*
55
* Permission is hereby granted, free of charge, to any person obtaining a copy
66
* of this software and associated documentation files (the "Software"), to deal

‎abstract-factory/src/main/java/com/iluwatar/abstractfactory/ElfKingdomFactory.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/**
22
* The MIT License
3-
* Copyright (c) 2014 Ilkka Seppälä
3+
* Copyright (c) 2014-2016 Ilkka Seppälä
44
*
55
* Permission is hereby granted, free of charge, to any person obtaining a copy
66
* of this software and associated documentation files (the "Software"), to deal

‎abstract-factory/src/main/java/com/iluwatar/abstractfactory/King.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/**
22
* The MIT License
3-
* Copyright (c) 2014 Ilkka Seppälä
3+
* Copyright (c) 2014-2016 Ilkka Seppälä
44
*
55
* Permission is hereby granted, free of charge, to any person obtaining a copy
66
* of this software and associated documentation files (the "Software"), to deal

‎abstract-factory/src/main/java/com/iluwatar/abstractfactory/KingdomFactory.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/**
22
* The MIT License
3-
* Copyright (c) 2014 Ilkka Seppälä
3+
* Copyright (c) 2014-2016 Ilkka Seppälä
44
*
55
* Permission is hereby granted, free of charge, to any person obtaining a copy
66
* of this software and associated documentation files (the "Software"), to deal

‎abstract-factory/src/main/java/com/iluwatar/abstractfactory/OrcArmy.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/**
22
* The MIT License
3-
* Copyright (c) 2014 Ilkka Seppälä
3+
* Copyright (c) 2014-2016 Ilkka Seppälä
44
*
55
* Permission is hereby granted, free of charge, to any person obtaining a copy
66
* of this software and associated documentation files (the "Software"), to deal

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp