Skip to content

Commit 59880b9

Browse files
andy1138andy1138
committed
Merge remote-tracking branch 'upstream/java7' into autopublish
Conflicts: .travis.yml
2 parents 9d44128 + f89705b commit 59880b9

File tree

131 files changed

+4412
-25
lines changed

Some content is hidden

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

131 files changed

+4412
-25
lines changed

‎.gitignore‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,9 @@ build.properties
3232
/.cache
3333
/.idea
3434
/.settings
35+
/examples/.classpath
36+
/examples/.project
37+
scala-swing.iml
3538

3639
# bak files produced by ./cleanup-commit
3740
*.bak
@@ -42,4 +45,4 @@ qbin
4245
# Mac specific, but that is common enough a dev platform to warrant inclusion.
4346
.DS_Store
4447

45-
target/
48+
target/

‎.travis.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ env:
99
- secure: "g/d6gjq6g+t5ieI6DwOiL5k8XJ/ethlZ1ZZDA/uvOsCfkIu0MBL2cYGmwQ0gcBNBQ/02wZjXnTIgMhFhYLcgHtnicAjy+53fhjCYcTM6A61DCPhJ6txOjEEPrpnlqbvKauw0WuVGT8Kd52bhaMXPCE2GOWgPe+bJfDUTHSm86dw="
1010

1111
script:
12-
- admin/build.sh
12+
- sbt ++$TRAVIS_SCALA_VERSION clean update compile test
1313
scala:
1414
- 2.11.0
1515
jdk:

‎build.sbt‎

Lines changed: 17 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -19,15 +19,15 @@ scalaModuleOsgiSettings
1919

2020
OsgiKeys.exportPackage := Seq(s"scala.swing.*;version=${version.value}")
2121

22-
MimaPlugin.mimaDefaultSettings
23-
24-
MimaKeys.previousArtifact := Some(organization.value % s"${name.value}_2.11" % "1.0.1")
25-
26-
// run mima during tests
27-
test in Test := {
28-
MimaKeys.reportBinaryIssues.value
29-
(test in Test).value
30-
}
22+
//MimaPlugin.mimaDefaultSettings
23+
//
24+
//MimaKeys.previousArtifact := Some(organization.value % s"${name.value}_2.11" % "1.0.1")
25+
//
26+
//// run mima during tests
27+
//test in Test := {
28+
// MimaKeys.reportBinaryIssues.value
29+
// (test in Test).value
30+
//}
3131

3232

3333
// set the prompt (for this build) to include the project id.
@@ -44,6 +44,14 @@ lazy val examples = project.in( file("examples") )
4444
fork := true
4545
)
4646

47+
lazy val uitest = project.in( file("uitest") )
48+
.dependsOn(swing)
49+
.settings(
50+
scalaVersion := "2.11.1",
51+
fork in run := true,
52+
fork := true
53+
)
54+
4755

4856

4957

‎examples/src/main/resources/scala/swing/examples/tutorials/TextSamplerDemoHelp.html‎

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
2+
<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
3+
<html lang="en-us">
4+
<title>Styled Text Sample</title>
5+
<body>
6+
<img src="images/dukeWaveRed.gif" width="64" height="64" alt="Waving Duke icon"/>
7+
<p>This is an uneditable <code>EditorPane</code>,
8+
which was <em>initialized</em>
9+
with <strong>HTML</strong> text <font size=-2>from</font> a
10+
<font size=+2>URL</font>.
11+
</p>
12+
An editor pane uses specialized editor kits
13+
to read, write, display, and edit text of
14+
different formats.
15+
The Swing text package includes editor kits
16+
for plain text, HTML, and RTF.
17+
You can also develop
18+
custom editor kits for other formats.
19+
<!-- Start SiteCatalyst code -->
20+
<script type="text/javascript" language="JavaScript" src="http://www.oracle.com/ocom/groups/systemobject/@mktg_admin/documents/systemobject/s_code_download.js"></script>
21+
<script type="text/javascript" language="JavaScript" src="http://www.oracle.com/ocom/groups/systemobject/@mktg_admin/documents/systemobject/s_code.js"></script>
22+
<noscript>
23+
A browser with JavaScript enabled is required for this page to operate properly.
24+
</noscript>
25+
26+
<!-- ********** DO NOT ALTER ANYTHING BELOW THIS LINE ! *********** -->
27+
<!-- Below code will send the info to Omniture server -->
28+
<script type="text/javascript" language="javascript">var s_code=s.t();if(s_code)document.write(s_code)</script>
29+
30+
<!-- End SiteCatalyst code -->
31+
</body>
32+
</html>

‎examples/src/main/resources/scala/swing/examples/tutorials/images/Back24.gif‎

422 Bytes

‎examples/src/main/resources/scala/swing/examples/tutorials/images/Bird.gif‎

5.25 KB

‎examples/src/main/resources/scala/swing/examples/tutorials/images/Cat.gif‎

3.29 KB

‎examples/src/main/resources/scala/swing/examples/tutorials/images/Dog.gif‎

3.5 KB

‎examples/src/main/resources/scala/swing/examples/tutorials/images/FD.jpg‎

2.28 KB

‎examples/src/main/resources/scala/swing/examples/tutorials/images/Forward24.gif‎

434 Bytes

0 commit comments

Comments
 (0)