|
Lines 1130-1140
Link Here
|
| 1130 |
resources = selectFileResources(resources); |
1130 |
resources = selectFileResources(resources); |
| 1131 |
} |
1131 |
} |
| 1132 |
|
1132 |
|
| 1133 |
newerResources[i] = |
1133 |
if(duplicate.equals("overwrite")){ |
| 1134 |
ResourceUtils.selectOutOfDateSources(this, |
1134 |
newerResources[i] = resources; |
|
|
1135 |
} else { |
| 1136 |
newerResources[i] = |
| 1137 |
ResourceUtils.selectOutOfDateSources(this, |
| 1135 |
resources, |
1138 |
resources, |
| 1136 |
myMapper, |
1139 |
myMapper, |
| 1137 |
getZipScanner()); |
1140 |
getZipScanner()); |
|
|
1141 |
} |
| 1138 |
needsUpdate = needsUpdate || (newerResources[i].length > 0); |
1142 |
needsUpdate = needsUpdate || (newerResources[i].length > 0); |
| 1139 |
|
1143 |
|
| 1140 |
if (needsUpdate && !doUpdate) { |
1144 |
if (needsUpdate && !doUpdate) { |
|
Lines 1647-1653
Link Here
|
| 1647 |
* @see EnumeratedAttribute#getValues() |
1651 |
* @see EnumeratedAttribute#getValues() |
| 1648 |
*/ |
1652 |
*/ |
| 1649 |
public String[] getValues() { |
1653 |
public String[] getValues() { |
| 1650 |
return new String[] {"add", "preserve", "fail"}; |
1654 |
return new String[] {"add", "preserve", "fail", "overwrite"}; |
| 1651 |
} |
1655 |
} |
| 1652 |
} |
1656 |
} |
| 1653 |
|
1657 |
|