Skip to content

Commit 9d290bd

Browse files
JKArenaJKArena
committed
Changed sourcePath attribute for mxmlApplication from String to Collection<String>.
1 parent b355c7b commit 9d290bd

4 files changed

Lines changed: 15 additions & 15 deletions

File tree

‎jsf-flex-shared/core/src/main/java/com/googlecode/jsfFlex/shared/adapter/_MXMLApplicationContract.java‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,14 @@
1818
*/
1919
package com.googlecode.jsfFlex.shared.adapter;
2020

21+
import java.util.Collection;
22+
2123
/**
2224
* @author Ji Hoon Kim
2325
*/
2426
public interface _MXMLApplicationContract extends _MXMLContract {
2527

26-
String getSourcePath();
28+
Collection<String> getSourcePath();
2729

2830
String getExternalLibraryPath();
2931

‎jsf-flex/core/src/main/java/com/googlecode/jsfFlex/component/ext/AbstractMXMLUIApplication.java‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020

2121
import java.io.File;
2222
import java.io.IOException;
23+
import java.util.Collection;
2324

2425
import javax.faces.component.UIComponentBase;
2526
import javax.faces.context.FacesContext;
@@ -305,10 +306,10 @@ public void setPreMxmlIdentifier(String preMxmlIdentifier) {
305306
public abstract String getMxmlPackageName();
306307

307308
/**
308-
* This value will be passed to the mxmlc compiler when creating a SWF. It must be an absolutePath to a filesystem where additional ActionScript and MXML files that areneeded for the current SWF generation are located at. There can be multiple valuesseparated with a space.
309+
* This value will be passed to the mxmlc compiler when creating a SWF. It must be an absolutePath to a filesystem where additional ActionScript and MXML files that are needed for the current SWF generation are located at.
309310
*/
310-
@JSFProperty(desc = "This value will be passed to the mxmlc compiler when creating a SWF. It must be an absolutePath to a filesystem where additional ActionScript and MXML files that areneeded for the current SWF generation are located at. There can be multiple valuesseparated with a space.")
311-
public abstract String getSourcePath();
311+
@JSFProperty(desc = "This value will be passed to the mxmlc compiler when creating a SWF. It must be an absolutePath to a filesystem where additional ActionScript and MXML files that are needed for the current SWF generation are located at.")
312+
public abstract Collection<String> getSourcePath();
312313

313314
/**
314315
* This value will be passed to the mxmlc compiler when creating a SWF. It represents the defaultBgColor, surprise.

‎runnerImpl/flexTaskRunnerImpl/antFlexTaskRunnerImpl/src/main/java/com/googlecode/jsfFlex/shared/tasks/ant/MXMLCTask.java‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -119,9 +119,8 @@ private void setArguments(){
119119
StringBuilder sourcePathVal = new StringBuilder();
120120

121121
if(_componentMXML.getSourcePath() != null){
122-
String[] sourcePath = _componentMXML.getSourcePath().split(" ");
123-
124-
for(String currPath : sourcePath){
122+
123+
for(String currPath : _componentMXML.getSourcePath()){
125124
sourcePathVal.append(MXMLConstants.STRING_QUOTE);
126125
sourcePathVal.append(currPath);
127126
sourcePathVal.append(MXMLConstants.STRING_QUOTE);
@@ -257,8 +256,8 @@ public String toString() {
257256
content.append(" ] ");
258257
content.append("source_path [");
259258
if(_componentMXML.getSourcePath() != null){
260-
String[] sourcePath = _componentMXML.getSourcePath().split(" ");
261-
for(String currSourcePath : sourcePath){
259+
260+
for(String currSourcePath : _componentMXML.getSourcePath()){
262261
content.append(" ");
263262
content.append(currSourcePath);
264263
}

‎runnerImpl/flexTaskRunnerImpl/jythonFlexTaskRunnerImpl/src/main/java/com/googlecode/jsfFlex/shared/tasks/jython/MXMLCTask.java‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -116,9 +116,8 @@ private Vector<String> getCommandArguments(){
116116
StringBuilder sourcePathVal = new StringBuilder();
117117

118118
if(_componentMXML.getSourcePath() != null){
119-
String[] sourcePath = _componentMXML.getSourcePath().split(" ");
120-
121-
for(String currSourcePath : sourcePath){
119+
120+
for(String currSourcePath : _componentMXML.getSourcePath()){
122121
sourcePathVal.append(MXMLConstants.STRING_QUOTE);
123122
sourcePathVal.append(currSourcePath);
124123
sourcePathVal.append(MXMLConstants.STRING_QUOTE);
@@ -224,9 +223,8 @@ public String toString() {
224223
content.append(" ] ");
225224
content.append("source_path [");
226225
if(_componentMXML.getSourcePath() != null){
227-
String[] sourcePath = _componentMXML.getSourcePath().split(" ");
228-
229-
for(String currSourcePath : sourcePath){
226+
227+
for(String currSourcePath : _componentMXML.getSourcePath()){
230228
content.append(" ");
231229
content.append(currSourcePath);
232230
}

0 commit comments

Comments
 (0)