Skip to content

Commit a1b2b57

Browse files
JihoonKim1004JihoonKim1004
JihoonKim1004
authored and
JihoonKim1004
committed
Cleaned up code and moved the dependencies to jsf api/impl from jsf-flex/pom.xml to main/pom.xml [top pom.xml]. Then had jsf-flex and runnerImpl have its parent as main, so to inherit the properties/profile for jsf api/impl.
1 parent 99f04e0 commit a1b2b57

File tree

28 files changed

+328
-373
lines changed

28 files changed

+328
-373
lines changed

‎jsf-flex-build-plugIn/jsf-flex-plugIn/src/main/java/com/googlecode/jsfFlexPlugIn/inspector/qdox/JsfFlexQdoxInspector.java‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -49,22 +49,19 @@ public JsfFlexQdoxInspector(String dirPath, String... patternList){
4949
@Override
5050
public synchronized void inspectFiles(){
5151

52-
List<Map<String, ? extends Object>> _inspectedList;
53-
Map<String, Object> _inspectedMap;
54-
DocletTag[] _inspectedDocletTag;
5552
JavaDocBuilder builder = new JavaDocBuilder();
5653
builder.addSourceTree(new File(getDirPath()));
5754
JavaClass[] _inspectableFiles = builder.getClasses();
5855

5956
for(JavaClass _currClass : _inspectableFiles){
6057
//TODO implement it better later, but since it's a plug-in does it have to be???
61-
_inspectedList = new LinkedList<Map<String, ? extends Object>>();
58+
List<Map<String, ? extends Object>> _inspectedList = new LinkedList<Map<String, ? extends Object>>();
6259

6360
for(String _currPattern : _patternList){
64-
_inspectedDocletTag = _currClass.getTagsByName(_currPattern);
61+
DocletTag[] _inspectedDocletTag = _currClass.getTagsByName(_currPattern);
6562

6663
for(DocletTag _currDocletTag : _inspectedDocletTag){
67-
_inspectedMap = new LinkedHashMap<String, Object>();
64+
Map<String, Object> _inspectedMap = new LinkedHashMap<String, Object>();
6865
_inspectedMap.putAll(_currDocletTag.getNamedParameterMap());
6966
_inspectedList.add(_inspectedMap);
7067
}

‎jsf-flex-build-plugIn/jsf-flex-plugIn/src/main/java/com/googlecode/jsfFlexPlugIn/mojo/CreateComponentValueMapperXMLMojo.java‎

Lines changed: 8 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -284,19 +284,14 @@ public void inspectFiles(){
284284
* NAME_APPEND_KEY
285285
*
286286
*/
287-
List<Map<String, ? extends Object>> _inspectedList;
288-
Map<String, String> _inspectedMap;
289287
JavaDocBuilder builder = new JavaDocBuilder();
290288
builder.addSourceTree(new File(getDirPath()));
291289
JavaClass[] _inspectableFiles = builder.getClasses();
292-
JsfFlexAttributeProperties _jsfFlexAttributeList;
293-
StringBuilder _toBuildString;
294-
String _builtString;
295290

296291
for(JavaClass _currClass : _inspectableFiles){
297-
_jsfFlexAttributeList = _currClass.getClass().getAnnotation(JsfFlexAttributeProperties.class);
298-
_inspectedList = new LinkedList<Map<String, ? extends Object>>();
299-
_inspectedMap = new LinkedHashMap<String, String>();
292+
JsfFlexAttributeProperties _jsfFlexAttributeList = _currClass.getClass().getAnnotation(JsfFlexAttributeProperties.class);
293+
List<Map<String, ? extends Object>> _inspectedList = new LinkedList<Map<String, ? extends Object>>();
294+
Map<String, String> _inspectedMap = new LinkedHashMap<String, String>();
300295

301296
if(_jsfFlexAttributeList == null || _jsfFlexAttributeList.mxmlComponentPackage() == null ||
302297
_jsfFlexAttributeList.mxmlComponentName().length() == 0){
@@ -319,8 +314,9 @@ public void inspectFiles(){
319314
_inspectedMap.put(VALUE_DYNAMIC_KEY, String.valueOf(_currComponentNodeInfo.isValueDynamic()));
320315
_inspectedMap.put(VALUE_NESTED_KEY, String.valueOf(_currComponentNodeInfo.isValueNested()));
321316

317+
String _builtString;
322318
if(_currComponentNodeInfo.isValueNested()){
323-
_toBuildString = new StringBuilder();
319+
StringBuilder _toBuildString = new StringBuilder();
324320

325321
for(String _buildInto : _currComponentNodeInfo.valueNestedValues()){
326322
_toBuildString.append(_buildInto);
@@ -435,9 +431,9 @@ public void inspectionCompleted() {
435431
public void mergeCollectionToTemplateFinished(String _fileMerged) {
436432

437433
ReplaceText removeEmptySpace = new ReplaceText(_fileMerged);
438-
removeEmptySpace.setReplaceRegExp(true);
439-
removeEmptySpace.setRegMatch(ReplaceText.CLEAN_REG_EXP_MATCH);
440-
removeEmptySpace.setRegReplace(ReplaceText.CLEAN_REG_EXP_REPLACE_WITH);
434+
removeEmptySpace.replaceRegExp(true);
435+
removeEmptySpace.regMatch(ReplaceText.CLEAN_REG_EXP_MATCH);
436+
removeEmptySpace.regReplace(ReplaceText.CLEAN_REG_EXP_REPLACE_WITH);
441437

442438
removeEmptySpace.performTask();
443439

‎jsf-flex-build-plugIn/jsf-flex-plugIn/src/main/java/com/googlecode/jsfFlexPlugIn/mojo/CreateReplaceMappingXMLMojo.java‎

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -82,10 +82,9 @@ public CreateReplaceMappingXMLMojo(){
8282
public void execute() throws MojoExecutionException, MojoFailureException {
8383
List _compileSourceRoots = project.getCompileSourceRoots();
8484

85-
String _currDirPath;
8685
for(Iterator _compileSourceRootsIterator = _compileSourceRoots.iterator();
8786
_compileSourceRootsIterator.hasNext();){
88-
_currDirPath = (String) _compileSourceRootsIterator.next();
87+
String _currDirPath = (String) _compileSourceRootsIterator.next();
8988
_jsfFlexInspector = new JsfFlexQdoxInspector(_currDirPath, JSF_FLEX_ATTRIBUTE);
9089
_jsfFlexInspector.addInspectListener(this);
9190

@@ -183,9 +182,8 @@ private List<ReplaceMappingXMLVelocityObject> generateReplaceMappingXMLVelocityO
183182

184183
for(Map<String, ? extends Object> _readNamedParameter : _readNamedParameterList){
185184

186-
Object _byMethod;
187185
for(String _token : _readNamedParameter.keySet()){
188-
_byMethod = _readNamedParameter.get(_token);
186+
Object _byMethod = _readNamedParameter.get(_token);
189187
_byMethod = _byMethod == null ? "false" : _byMethod;
190188
_replaceMappingXMLVelocityObjects.add(new ReplaceMappingXMLVelocityObject(_token, Boolean.valueOf((String) _byMethod)));
191189
}
@@ -198,9 +196,9 @@ private List<ReplaceMappingXMLVelocityObject> generateReplaceMappingXMLVelocityO
198196
public void mergeCollectionToTemplateFinished(String _fileMerged){
199197

200198
ReplaceText removeEmptySpace = new ReplaceText(_fileMerged);
201-
removeEmptySpace.setReplaceRegExp(true);
202-
removeEmptySpace.setRegMatch(ReplaceText.CLEAN_REG_EXP_MATCH);
203-
removeEmptySpace.setRegReplace(ReplaceText.CLEAN_REG_EXP_REPLACE_WITH);
199+
removeEmptySpace.replaceRegExp(true);
200+
removeEmptySpace.regMatch(ReplaceText.CLEAN_REG_EXP_MATCH);
201+
removeEmptySpace.regReplace(ReplaceText.CLEAN_REG_EXP_REPLACE_WITH);
204202

205203
removeEmptySpace.performTask();
206204

‎jsf-flex-build-plugIn/jsf-flex-plugIn/src/main/java/com/googlecode/jsfFlexPlugIn/parser/velocity/JsfFlexVelocityParser.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,9 +77,8 @@ public void init(){
7777

7878
public synchronized void mergeCollectionToTemplate(String _template, Map<String, Object> _contextInfo, Writer _targetWriter, String _fileMerged){
7979

80-
String _currKey;
8180
for(Iterator<String> _contextInfoIterator = _contextInfo.keySet().iterator(); _contextInfoIterator.hasNext();){
82-
_currKey = _contextInfoIterator.next();
81+
String _currKey = _contextInfoIterator.next();
8382
_context.put(_currKey, _contextInfo.get(_currKey));
8483
}
8584

‎jsf-flex-build-plugIn/jsf-flex-plugIn/src/main/java/com/googlecode/jsfFlexPlugIn/utils/tasks/ReplaceText.java‎

Lines changed: 23 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -120,46 +120,41 @@ public void performTask() {
120120

121121
try {
122122

123-
java.util.Iterator iterate = _replaceList.keySet().iterator();
124-
String tokenVal;
125123
String targetToExecute = "";
126124

127-
if(isMultiLineReplace()){
125+
if(_multiLineReplace){
128126

129-
_replaceMultiLineTask.setFile(new File(getFile()));
130-
Replacefilter replaceFilt;
127+
_replaceMultiLineTask.setFile(new File(_file));
131128

132-
while(iterate.hasNext()){
133-
tokenVal = (String) iterate.next();
129+
for(Iterator iterate = _replaceList.keySet().iterator(); iterate.hasNext();){
130+
String tokenVal = (String) iterate.next();
134131

135-
replaceFilt = _replaceMultiLineTask.createReplacefilter();
132+
Replacefilter replaceFilt = _replaceMultiLineTask.createReplacefilter();
136133
replaceFilt.setToken(tokenVal);
137134
replaceFilt.setValue((String) _replaceList.get(tokenVal));
138135
}
139136
_replaceMultiLineTask.maybeConfigure();
140137
targetToExecute = REPLACE_MULTI_LINE_TARGET;
141-
}else if(isReplaceText()){
138+
}else if(_replaceText){
142139

143-
_replaceTextTask.setFile(new File(getFile()));
144-
NestedString nestedToken = null;
145-
NestedString nestedValue = null;
140+
_replaceTextTask.setFile(new File(_file));
146141

147-
while(iterate.hasNext()){
148-
tokenVal = (String) iterate.next();
149-
nestedToken = _replaceTextTask.createReplaceToken();
142+
for(Iterator iterate = _replaceList.keySet().iterator(); iterate.hasNext();){
143+
String tokenVal = (String) iterate.next();
144+
NestedString nestedToken = _replaceTextTask.createReplaceToken();
150145
nestedToken.addText(tokenVal);
151-
nestedValue = _replaceTextTask.createReplaceValue();
146+
NestedString nestedValue = _replaceTextTask.createReplaceValue();
152147
nestedValue.addText((String) _replaceList.get(tokenVal));
153148
}
154149

155150
_replaceTextTask.maybeConfigure();
156151
targetToExecute = REPLACE_TEXT_TARGET;
157-
}else if(isReplaceRegExp()){
152+
}else if(_replaceRegExp){
158153

159-
_replaceRegExpTask.setFile(new File(getFile()));
160-
_replaceRegExpTask.setMatch(getRegMatch());
161-
_replaceRegExpTask.setReplace(getRegReplace());
162-
_replaceRegExpTask.setFlags(getFlags());
154+
_replaceRegExpTask.setFile(new File(_file));
155+
_replaceRegExpTask.setMatch(_regMatch);
156+
_replaceRegExpTask.setReplace(_regReplace);
157+
_replaceRegExpTask.setFlags(_flags);
163158

164159
_replaceRegExpTask.maybeConfigure();
165160
targetToExecute = REPLACE_REG_EXP_TARGET;
@@ -214,55 +209,31 @@ public String toString() {
214209
return content.toString();
215210
}
216211

217-
public String getFile() {
218-
return _file;
219-
}
220-
public void setFile(String file) {
212+
public void file(String file) {
221213
_file = file;
222214
}
223-
public boolean isMultiLineReplace() {
224-
return _multiLineReplace;
225-
}
226-
public void setMultiLineReplace(boolean multiLineReplace) {
215+
public void multiLineReplace(boolean multiLineReplace) {
227216
_multiLineReplace = multiLineReplace;
228217
_replaceText = false;
229218
_replaceRegExp = false;
230219
}
231-
public boolean isReplaceRegExp() {
232-
return _replaceRegExp;
233-
}
234-
public void setReplaceRegExp(boolean replaceRegExp) {
220+
public void replaceRegExp(boolean replaceRegExp) {
235221
_replaceRegExp = replaceRegExp;
236222
_multiLineReplace = false;
237223
_replaceText = false;
238224
}
239-
public boolean isReplaceText() {
240-
return _replaceText;
241-
}
242-
public void setReplaceText(boolean replaceText) {
225+
public void replaceText(boolean replaceText) {
243226
_replaceText = replaceText;
244227
_multiLineReplace = false;
245228
_replaceRegExp = false;
246229
}
247-
public Map getReplaceList() {
248-
return _replaceList;
249-
}
250-
public String getFlags() {
251-
return _flags;
252-
}
253-
public void setFlags(String flags) {
230+
public void flags(String flags) {
254231
_flags = flags;
255232
}
256-
public String getRegMatch() {
257-
return _regMatch;
258-
}
259-
public void setRegMatch(String regMatch) {
233+
public void regMatch(String regMatch) {
260234
_regMatch = regMatch;
261235
}
262-
public String getRegReplace() {
263-
return _regReplace;
264-
}
265-
public void setRegReplace(String regReplace) {
236+
public void regReplace(String regReplace) {
266237
_regReplace = regReplace;
267238
}
268239

‎jsf-flex-shared/core/src/main/java/com/googlecode/jsfFlex/shared/beans/mxml/MXMLArrayBean.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,9 +58,8 @@ public String generateVariableInfoAsString() {
5858

5959
StringBuffer generatedString = new StringBuffer(LEFT_ARRAY_CLOSURE);
6060

61-
_MXMLBean _objectBean;
6261
for(Iterator iterator = _beanArrayList.iterator(); iterator.hasNext();){
63-
_objectBean = (_MXMLBean) iterator.next();
62+
_MXMLBean _objectBean = (_MXMLBean) iterator.next();
6463
generatedString.append(_objectBean.generateVariableInfoAsString());
6564
if(iterator.hasNext()){
6665
generatedString.append(",");

‎jsf-flex-shared/core/src/main/java/com/googlecode/jsfFlex/shared/beans/mxml/MXMLObjectBean.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,9 +59,8 @@ public void addData(String label, String data){
5959
public String generateVariableInfoAsString(){
6060
StringBuffer generatedString = new StringBuffer(LEFT_OBJECT_ENCLOSURE);
6161

62-
MXMLObjectData _mxmlObjectData;
6362
for(Iterator iterator = _objectDataSet.iterator(); iterator.hasNext();){
64-
_mxmlObjectData = (MXMLObjectData) iterator.next();
63+
MXMLObjectData _mxmlObjectData = (MXMLObjectData) iterator.next();
6564
generatedString.append(_mxmlObjectData.generateVariableInfoAsString());
6665
if(iterator.hasNext()){
6766
generatedString.append(",");

‎jsf-flex-shared/core/src/main/java/com/googlecode/jsfFlex/shared/tasks/TaskRunnerImpl.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,9 +67,8 @@ public void addTasks(Collection _tasksToAdd) {
6767
public void execute() {
6868

6969
synchronized(_lock){
70-
_Task current;
7170
for(Iterator iterate = _tasks.iterator(); iterate.hasNext();){
72-
current = (_Task) iterate.next();
71+
_Task current = (_Task) iterate.next();
7372
current.performTask();
7473
}
7574
clearAllTask();

‎jsf-flex/core/src/main/java/com/googlecode/jsfFlex/filter/JsfFlexResourceFilter.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -108,8 +108,6 @@ public void doFilter(ServletRequest request, ServletResponse response, FilterCha
108108

109109
/** Finished with the usual path of request/response. Now specific for JSF Flex*/
110110

111-
Collection resourceCollection = jsfFlexDojoResource.getResources();
112-
113111
if(jsfFlexResponseWrapper.getContentType() != null && isValidContentType(jsfFlexResponseWrapper.getContentType())){
114112

115113
Matcher headMatcher = HEAD_PATTERN.matcher( jsfFlexResponseWrapper.toString() );
@@ -129,6 +127,7 @@ public void doFilter(ServletRequest request, ServletResponse response, FilterCha
129127

130128
actualWriter.write( jsfFlexResponseWrapper.toString().substring(headMatchIndex+5, endTagCharIndex+1) );
131129

130+
Collection resourceCollection = jsfFlexDojoResource.getResources();
132131
String resourceConvertedToScriptElements = constructResourceToScriptTags(resourceCollection, requestURISplitted);
133132

134133
actualWriter.write(resourceConvertedToScriptElements);
@@ -146,6 +145,7 @@ public void doFilter(ServletRequest request, ServletResponse response, FilterCha
146145

147146
actualWriter.write(HEAD_START_TAG);
148147

148+
Collection resourceCollection = jsfFlexDojoResource.getResources();
149149
String resourceConvertedToScriptElements = constructResourceToScriptTags(resourceCollection, requestURISplitted);
150150

151151
actualWriter.write(resourceConvertedToScriptElements);

‎jsf-flex/core/src/main/java/com/googlecode/jsfFlex/renderkit/MXMLRenderKitImpl.java‎

Lines changed: 8 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -66,20 +66,17 @@ public void addRenderer(String family, String rendererType, Renderer renderer) {
6666
throw new NullPointerException("addRenderer: rendererType must not be null");
6767
}
6868

69-
Object _rendererTypeObject;
7069
Map _rendererTypeMap;
7170
/*
7271
* Since there exists many rendererType for a single family
7372
*/
74-
if((_rendererTypeObject = _renderers.get(family)) != null){
75-
_rendererTypeMap = (Map) _rendererTypeObject;
76-
_rendererTypeMap.put(rendererType, renderer);
77-
}else{
73+
if((_rendererTypeMap = (Map) _renderers.get(family)) == null){
7874
_rendererTypeMap = new HashMap();
79-
_rendererTypeMap.put(rendererType, renderer);
8075
_renderers.put(family, _rendererTypeMap);
8176
}
8277

78+
_rendererTypeMap.put(rendererType, renderer);
79+
8380
}
8481

8582
public Renderer getRenderer(String family, String rendererType) {
@@ -91,13 +88,11 @@ public Renderer getRenderer(String family, String rendererType) {
9188
}
9289

9390
Renderer _renderer = null;
94-
Object _rendererTypeObject = _renderers.get(family);
95-
if(_rendererTypeObject == null){
91+
Map _rendererTypeMap = (Map) _renderers.get(family);
92+
if(_rendererTypeMap == null){
9693
_log.info("Empty entry within getRenderes for family [ " + family + " ] rendererType [ " + rendererType + " ] ");
9794
}else{
98-
Map _rendererTypeMap = (Map) _rendererTypeObject;
99-
Object _rendererObject;
100-
_renderer = (_rendererObject = _rendererTypeMap.get(rendererType)) != null ? (Renderer) _rendererObject : null;
95+
_renderer = (Renderer) _rendererTypeMap.get(rendererType);
10196
}
10297

10398
return _renderer;
@@ -167,8 +162,6 @@ private static final class MXMLRenderKitImplHelper {
167162

168163
private static final String selectContentType(String contentTypeListString){
169164

170-
String contentType = null;
171-
172165
if(contentTypeListString == null){
173166
FacesContext currFacesContext = FacesContext.getCurrentInstance();
174167

@@ -186,9 +179,9 @@ private static final String selectContentType(String contentTypeListString){
186179
List contentTypeList = Arrays.asList(contentTypeListString.replaceAll("[;\\s]", "").split(","));
187180
//Always search first as htmlAcceptContentType
188181

189-
String currentContentType;
182+
String contentType = null;
190183
for(Iterator iterate = contentTypeList.iterator(); iterate.hasNext();){
191-
currentContentType = (String) iterate.next();
184+
String currentContentType = (String) iterate.next();
192185

193186
if(_htmlAcceptContentType.contains(currentContentType)){
194187
contentType = HTML_CONTENT_TYPE;

0 commit comments

Comments
 (0)