Author: rwhitcomb
Date: Tue Jul 21 16:09:12 2015
New Revision: 1692159
URL: http://svn.apache.org/r1692159
Log:
PIVOT-975: Build problems with Java 1.8.0_45
First, enable Java 1.8 as a valid Java version number.
Then, there are errors related to LocalManifestAdapter being a second
class within the LocalManifest.java file. It should be moved to its
own source file.
This is a merge of revision 1692157 from branches/2.0.x to trunk.
Added:
pivot/trunk/wtk/src/org/apache/pivot/wtk/LocalManifestAdapter.java
- copied, changed from r1692157,
pivot/branches/2.0.x/wtk/src/org/apache/pivot/wtk/LocalManifestAdapter.java
Modified:
pivot/trunk/ (props changed)
pivot/trunk/build.xml
pivot/trunk/wtk/src/org/apache/pivot/wtk/LocalManifest.java
Propchange: pivot/trunk/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jul 21 16:09:12 2015
@@ -1 +1 @@
-/pivot/branches/2.0.x:1388236,1388681,1391496,1392533,1446780,1447977,1448356,1458918,1459950,1460982,1461332,1479613,1505062,1523284,1538840,1542170,1551768,1551992,1580958,1602230,1602233
+/pivot/branches/2.0.x:1388236,1388681,1391496,1392533,1446780,1447977,1448356,1458918,1459950,1460982,1461332,1479613,1505062,1523284,1538840,1542170,1551768,1551992,1580958,1602230,1602233,1692157
Modified: pivot/trunk/build.xml
URL:
http://svn.apache.org/viewvc/pivot/trunk/build.xml?rev=1692159&r1=1692158&r2=1692159&view=diff
==============================================================================
--- pivot/trunk/build.xml (original)
+++ pivot/trunk/build.xml Tue Jul 21 16:09:12 2015
@@ -112,6 +112,7 @@ limitations under the License.
<not>
<or>
<equals arg1="${ant.java.version}" arg2="1.7"/>
+ <equals arg1="${ant.java.version}" arg2="1.8"/>
</or>
</not>
</condition>
Modified: pivot/trunk/wtk/src/org/apache/pivot/wtk/LocalManifest.java
URL:
http://svn.apache.org/viewvc/pivot/trunk/wtk/src/org/apache/pivot/wtk/LocalManifest.java?rev=1692159&r1=1692158&r2=1692159&view=diff
==============================================================================
--- pivot/trunk/wtk/src/org/apache/pivot/wtk/LocalManifest.java (original)
+++ pivot/trunk/wtk/src/org/apache/pivot/wtk/LocalManifest.java Tue Jul 21
16:09:12 2015
@@ -106,72 +106,3 @@ public class LocalManifest implements Ma
}
}
-class LocalManifestAdapter implements Transferable {
- private LocalManifest localManifest;
- private ArrayList<DataFlavor> transferDataFlavors = new ArrayList<>();
-
- private static final String URI_LIST_MIME_TYPE = "text/uri-list;
class=java.lang.String";
-
- public LocalManifestAdapter(LocalManifest localManifest) {
- this.localManifest = localManifest;
-
- if (localManifest.containsText()) {
- transferDataFlavors.add(DataFlavor.stringFlavor);
- }
-
- if (localManifest.containsImage()) {
- transferDataFlavors.add(DataFlavor.imageFlavor);
- }
-
- if (localManifest.containsFileList()) {
- transferDataFlavors.add(DataFlavor.javaFileListFlavor);
-
- try {
- transferDataFlavors.add(new DataFlavor(URI_LIST_MIME_TYPE));
- } catch (ClassNotFoundException exception) {
- // No-op
- }
- }
- }
-
- @Override
- public Object getTransferData(DataFlavor dataFlavor) throws
UnsupportedFlavorException {
- Object transferData = null;
-
- int index = transferDataFlavors.indexOf(dataFlavor);
- if (index == -1) {
- throw new UnsupportedFlavorException(dataFlavor);
- }
-
- if (dataFlavor.equals(DataFlavor.stringFlavor)) {
- transferData = localManifest.getText();
- } else if (dataFlavor.equals(DataFlavor.imageFlavor)) {
- Picture picture = (Picture) localManifest.getImage();
- transferData = picture.getBufferedImage();
- } else if (dataFlavor.equals(DataFlavor.javaFileListFlavor)) {
- FileList fileList = localManifest.getFileList();
- transferData = fileList.getList();
- } else if (dataFlavor.getMimeType().equals(URI_LIST_MIME_TYPE)) {
- FileList fileList = localManifest.getFileList();
-
- StringBuilder buf = new StringBuilder();
- for (File file : fileList) {
- buf.append(file.toURI().toString()).append("\r\n");
- }
-
- transferData = buf.toString();
- }
-
- return transferData;
- }
-
- @Override
- public DataFlavor[] getTransferDataFlavors() {
- return transferDataFlavors.toArray(DataFlavor[].class);
- }
-
- @Override
- public boolean isDataFlavorSupported(DataFlavor dataFlavor) {
- return (transferDataFlavors.indexOf(dataFlavor) != -1);
- }
-}
Copied: pivot/trunk/wtk/src/org/apache/pivot/wtk/LocalManifestAdapter.java
(from r1692157,
pivot/branches/2.0.x/wtk/src/org/apache/pivot/wtk/LocalManifestAdapter.java)
URL:
http://svn.apache.org/viewvc/pivot/trunk/wtk/src/org/apache/pivot/wtk/LocalManifestAdapter.java?p2=pivot/trunk/wtk/src/org/apache/pivot/wtk/LocalManifestAdapter.java&p1=pivot/branches/2.0.x/wtk/src/org/apache/pivot/wtk/LocalManifestAdapter.java&r1=1692157&r2=1692159&rev=1692159&view=diff
==============================================================================
--- pivot/branches/2.0.x/wtk/src/org/apache/pivot/wtk/LocalManifestAdapter.java
(original)
+++ pivot/trunk/wtk/src/org/apache/pivot/wtk/LocalManifestAdapter.java Tue Jul
21 16:09:12 2015
@@ -31,7 +31,7 @@ import org.apache.pivot.wtk.media.Pictur
*/
public class LocalManifestAdapter implements Transferable {
private LocalManifest localManifest;
- private ArrayList<DataFlavor> transferDataFlavors = new
ArrayList<DataFlavor>();
+ private ArrayList<DataFlavor> transferDataFlavors = new ArrayList<>();
private static final String URI_LIST_MIME_TYPE = "text/uri-list;
class=java.lang.String";
@@ -70,7 +70,7 @@ public class LocalManifestAdapter implem
if (dataFlavor.equals(DataFlavor.stringFlavor)) {
transferData = localManifest.getText();
} else if (dataFlavor.equals(DataFlavor.imageFlavor)) {
- Picture picture = (Picture)localManifest.getImage();
+ Picture picture = (Picture) localManifest.getImage();
transferData = picture.getBufferedImage();
} else if (dataFlavor.equals(DataFlavor.javaFileListFlavor)) {
FileList fileList = localManifest.getFileList();
