Skip to content
This repository has been archived by the owner on Jul 10, 2018. It is now read-only.
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: kirill-grouchnikov/substance-swingx
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: master
Choose a base ref
...
head repository: Insubstantial/insubstantialSwingX
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref
Able to merge. These branches can be automatically merged.
  • 7 commits
  • 82 files changed
  • 1 contributor

Commits on Apr 3, 2011

  1. gradlelize

    shemnon committed Apr 3, 2011
    Copy the full SHA
    2d75317 View commit details
  2. gradle files

    shemnon committed Apr 3, 2011
    Copy the full SHA
    dd32b6c View commit details
  3. add the gradle wrapper

    shemnon committed Apr 3, 2011
    Copy the full SHA
    703ef9b View commit details
  4. Copy the full SHA
    3ff4b30 View commit details

Commits on Apr 4, 2011

  1. 6.2 release

    shemnon committed Apr 4, 2011
    Copy the full SHA
    8c52569 View commit details
  2. Copy the full SHA
    80dc32f View commit details
  3. change to 6.3 - defender

    shemnon committed Apr 4, 2011
    Copy the full SHA
    dc7cba1 View commit details
Showing with 519 additions and 282 deletions.
  1. +0 −16 .classpath
  2. +2 −0 .gitignore
  3. +0 −17 .project
  4. +0 −12 .settings/org.eclipse.jdt.core.prefs
  5. +236 −0 build.gradle
  6. +0 −8 build.properties
  7. +0 −229 build.xml
  8. BIN gradle/wrapper/gradle-wrapper.jar
  9. +9 −0 gradle/wrapper/gradle-wrapper.properties
  10. +145 −0 gradlew
  11. +126 −0 gradlew.bat
  12. BIN lib/substance-6.2-tst-hack.jar
  13. +1 −0 settings.gradle
  14. 0 src/{ → main/java}/org/pushingpixels/substance/swingx/SubstanceDatePickerUI.java
  15. 0 src/{ → main/java}/org/pushingpixels/substance/swingx/SubstanceErrorPaneUI.java
  16. 0 src/{ → main/java}/org/pushingpixels/substance/swingx/SubstanceHeaderUI.java
  17. 0 src/{ → main/java}/org/pushingpixels/substance/swingx/SubstanceHyperlinkUI.java
  18. 0 src/{ → main/java}/org/pushingpixels/substance/swingx/SubstanceLoginPaneUI.java
  19. 0 src/{ → main/java}/org/pushingpixels/substance/swingx/SubstanceMonthViewUI.java
  20. 0 src/{ → main/java}/org/pushingpixels/substance/swingx/SubstancePanelUI.java
  21. 0 src/{ → main/java}/org/pushingpixels/substance/swingx/SubstanceStatusBarUI.java
  22. 0 src/{ → main/java}/org/pushingpixels/substance/swingx/SubstanceSwingxFillBackgroundDelegate.java
  23. 0 src/{ → main/java}/org/pushingpixels/substance/swingx/SubstanceSwingxPlugin.java
  24. 0 src/{ → main/java}/org/pushingpixels/substance/swingx/SubstanceTableUI.java
  25. 0 src/{ → main/java}/org/pushingpixels/substance/swingx/SubstanceTaskPaneContainerUI.java
  26. 0 src/{ → main/java}/org/pushingpixels/substance/swingx/SubstanceTaskPaneUI.java
  27. 0 src/{ → main/java}/org/pushingpixels/substance/swingx/SubstanceTipOfTheDayUI.java
  28. 0 src/{ → main/java}/org/pushingpixels/substance/swingx/SubstanceTitledPanelUI.java
  29. 0 src/{ → main/resources}/META-INF/substance-plugin.xml
  30. BIN src/{ → main/resources}/resource/22/dialog-information.png
  31. BIN src/{ → main/resources}/resource/32/login-new32.png
  32. 0 src/test/{ → java/test}/LafChanger.java
  33. 0 src/test/{ → java/test}/MonthView.java
  34. 0 src/test/{ → java/test}/TablePanel.java
  35. 0 src/test/{ → java/test}/TestDatePicker.java
  36. 0 src/test/{ → java/test}/TestStatusBar.java
  37. 0 src/test/{ → java/test}/TestSwingXFrame.java
  38. 0 src/test/{ → java/test}/TreeTablePanel.java
  39. 0 src/test/{ → java/test}/contrib/DesktopDemo.java
  40. 0 src/test/{ → java/test}/contrib/InternalFrameDemo.java
  41. 0 src/test/{ → java/test}/contrib/JXPanelDemo.java
  42. BIN src/test/{ → resources/test}/check/icons/22/dialog-error.png
  43. BIN src/test/{ → resources/test}/check/icons/22/dialog-information.png
  44. BIN src/test/{ → resources/test}/check/icons/22/dialog-warning.png
  45. BIN src/test/{ → resources/test}/check/icons/22/edit-copy.png
  46. BIN src/test/{ → resources/test}/check/icons/22/edit-cut.png
  47. BIN src/test/{ → resources/test}/check/icons/22/edit-delete.png
  48. BIN src/test/{ → resources/test}/check/icons/22/edit-paste.png
  49. BIN src/test/{ → resources/test}/check/icons/22/edit-select-all.png
  50. BIN src/test/{ → resources/test}/check/icons/22/format-justify-center.png
  51. BIN src/test/{ → resources/test}/check/icons/22/format-justify-fill.png
  52. BIN src/test/{ → resources/test}/check/icons/22/format-justify-left.png
  53. BIN src/test/{ → resources/test}/check/icons/22/format-justify-right.png
  54. BIN src/test/{ → resources/test}/check/icons/22/format-text-bold.png
  55. BIN src/test/{ → resources/test}/check/icons/22/format-text-italic.png
  56. BIN src/test/{ → resources/test}/check/icons/22/format-text-strikethrough.png
  57. BIN src/test/{ → resources/test}/check/icons/22/format-text-underline.png
  58. BIN src/test/{ → resources/test}/check/icons/22/help-browser.png
  59. BIN src/test/{ → resources/test}/check/icons/22/process-stop.png
  60. BIN src/test/{ → resources/test}/contrib/image.jpg
  61. BIN src/test/{ → resources/test}/contrib/image2.jpg
  62. BIN src/test/{ → resources/test}/resource/image-x-generic.png
  63. 0 src/{docrobot → test/resources/test}/tips.properties
  64. 0 src/{ → tools/java}/docrobot/Configure.java
  65. 0 src/{ → tools/java}/docrobot/ErrorPaneRobot.java
  66. 0 src/{ → tools/java}/docrobot/ErrorPaneRunner.java
  67. 0 src/{ → tools/java}/docrobot/FrameRobot.java
  68. 0 src/{ → tools/java}/docrobot/HeaderFrame.java
  69. 0 src/{ → tools/java}/docrobot/HeaderRunner.java
  70. 0 src/{ → tools/java}/docrobot/LoginDialogRobot.java
  71. 0 src/{ → tools/java}/docrobot/LoginDialogRunner.java
  72. 0 src/{ → tools/java}/docrobot/MonthViewFrame.java
  73. 0 src/{ → tools/java}/docrobot/MonthViewRunner.java
  74. 0 src/{ → tools/java}/docrobot/RobotUtilities.java
  75. 0 src/{ → tools/java}/docrobot/StatusBarFrame.java
  76. 0 src/{ → tools/java}/docrobot/StatusBarRunner.java
  77. 0 src/{ → tools/java}/docrobot/TaskPaneFrame.java
  78. 0 src/{ → tools/java}/docrobot/TaskPaneRunner.java
  79. 0 src/{ → tools/java}/docrobot/TitledPanelFrame.java
  80. 0 src/{ → tools/java}/docrobot/TitledPanelRunner.java
  81. BIN src/{docrobot → tools/resources/docrbot}/applications-internet.png
  82. 0 src/{test → tools/resources/docrbot}/tips.properties
16 changes: 0 additions & 16 deletions .classpath

This file was deleted.

2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
.gradle
build
17 changes: 0 additions & 17 deletions .project

This file was deleted.

12 changes: 0 additions & 12 deletions .settings/org.eclipse.jdt.core.prefs

This file was deleted.

236 changes: 236 additions & 0 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -0,0 +1,236 @@
buildscript {
repositories {
mavenCentral()
}
dependencies {
classpath 'de.huxhorn.gradle:de.huxhorn.gradle.pgp-plugin:0.0.3'
}
}


apply plugin: 'java'
apply plugin: 'maven'
apply plugin: 'sign'
apply plugin: de.huxhorn.gradle.pgp.PgpPlugin

group = "com.github.insubstantial"
version = "6.3-SNAPSHOT"
versionKey = "6.3-defender-SNAPSHOT"
swingXVersion = "1.6.1"
release = "internal"
timeStamp = new Date().format("MMMM d, yyyy HH:mm:ss z")

sourceCompatibility = 1.6
targetCompatibility = 1.6

configurations {
testCompile { extendsFrom compile }
toolsCompile { extendsFrom compile }
}

sourceSets {
main
// gradle bug - cannont include two different classifiers of the same dependency
//test
//tools {
//compileClasspath = sourceSets.main.classes + sourceSets.test.classes + configurations.toolsCompile + configurations.testCompile
//}
}

repositories {
mavenRepo name: 'sonatype staging', urls: 'https://oss.sonatype.org/content/groups/staging'
mavenCentral()
mavenRepo urls: new File(System.getProperty('user.home'), '.m2/repository').toURI().toString()
}

dependencies {
compile group:'com.github.insubstantial', name:'substance', version: version
compile group:'org.swinglabs', name:'swingx', version: swingXVersion
testCompile files('lib/substance-6.2-tst-hack.jar')
testCompile group:'com.jgoodies', name:'forms', version:'1.2.0'
toolsCompile group:'com.github.insubstantial', name:'substance', version: version, ext:'tools'
toolsCompile group:'org.easytesting', name:'fest-swing', version:'1.2'
}

task augmentation(dependsOn: classes) {
description = "Performs code augmentaiton for the laf-plugin and laf-widget libraries on the substance jar classes"

doLast {
// Explode laf-plugin and laf-widget
// copy {
// from zipTree('lib/build/laf-plugin.jar')
// into sourceSets.main.classesDir
// }
// copy {
// from zipTree('lib/build/laf-widget.jar')
// into sourceSets.main.classesDir
// }


augmentClassPath = configurations.toolsCompile.asPath + File.pathSeparator + configurations.compile.asPath

ant.taskdef(name: 'delegate-augment', classname: "org.pushingpixels.lafwidget.ant.AugmentTask", classpath: augmentClassPath)
ant.taskdef(name: 'delegate-update-augment', classname: "org.pushingpixels.lafwidget.ant.AugmentUpdateTask", classpath: augmentClassPath)
ant.taskdef(name: 'laf-augment', classname: "org.pushingpixels.lafwidget.ant.AugmentMainTask", classpath: augmentClassPath)
ant.taskdef(name: 'icon-ghosting-augment', classname: "org.pushingpixels.lafwidget.ant.AugmentIconGhostingTask", classpath: augmentClassPath)
ant.taskdef(name: 'container-ghosting-augment', classname: "org.pushingpixels.lafwidget.ant.AugmentContainerGhostingTask", classpath: augmentClassPath)

verboseAugmentation = false

//LAF augmentation
//ant.'laf-augment'(verbose: verboseAugmentaiton, mainlafclassname:"org.pushingpixels.substance.api.SubstanceLookAndFeel") {
// classpathset(dir:sourceSets.main.classesDir)
// delegate(name:"ViewportUI")
//}

// Delegate augmentation
ant.'delegate-update-augment'(verbose: verboseAugmentation, pattern: ".*UI\u002Eclass") {
classpathset(dir: sourceSets.main.classesDir)
}

ant.'delegate-augment'(verbose: verboseAugmentation, pattern: ".*UI\u002Eclass") {
classpathset(dir: sourceSets.main.classesDir)
}

// Container ghosting augmentation
ant.'container-ghosting-augment'(verbose: verboseAugmentation) {
classpathset(dir: sourceSets.main.classesDir)
containerghosting(className: "org.pushingpixels.substance.swingx.SubstanceStatusBarUI", toInjectAfterOriginal: "true")
containerghosting(className: "org.pushingpixels.substance.swingx.SubstanceTaskPaneContainerUI", toInjectAfterOriginal: "true")
}
}
}

jar {
dependsOn augmentation
//dependsOn toolsClasses

manifest {
attributes(
"Substance-Version": version,
"SwingX-Version": swingXVersion,
"Substance-VersionName": versionKey,
"Substance-SwingX-BuildStamp": timeStamp
)
}

}

task testJar(type: Jar) {
classifier = 'tst'

from sourceSets.test.classes

manifest {
attributes(
"Substance-Version": version,
"Flamingo-Version": version,
"Substance-VersionName": versionKey,
"Flamingo-VersionName": versionKey,
"Substance-BuildStamp": timeStamp
)
}
}

task distroJar(type: Jar) {
//dependsOn toolsJar, testJar, jar
dependsOn jar
classifier = 'all'
from(projectDir)
include "lib/**"
include "src/**"
include "www/**/*.html"
include "www/docs/**"
include "www/images/**"
include "gradle.properties"
include "build.gradle"
}

//allSubstanceJars = [toolsJar, liteJar, testJar, testLiteJar, distroJar]

//uploadArchives.dependsOn << allSubstanceJars
//assemble.dependsOn << allSubstanceJars

task sourceJar(type: Jar) {
from sourceSets.main.java
from sourceSets.main.resources
classifier = 'sources'
}

task javadocJar(type: Jar) {
dependsOn javadoc
from javadoc.destinationDir
classifier = 'javadoc'
}

artifacts {
archives sourceJar
archives javadocJar
//archives toolsJar
//archives liteJar
}

uploadArchives {
try {
def x = [deployUsername, deployPassword]
} catch (Exception e) {
deployUsername = 'unset'
deployPassword = ''
}
repositories {
mavenDeployer {
snapshotRepository(url: "https://oss.sonatype.org/content/repositories/snapshots/") {
authentication userName: deployUsername, password: deployPassword
}
repository(url: "https://oss.sonatype.org/service/local/staging/deploy/maven2/") {
authentication userName: deployUsername, password: deployPassword
}
pom.project {
modelVersion '4.0.0'
packaging 'jar'
name "insubstantialSwingX"
description "A fork of @kirilcool's substance project"
url "http://insubstantial.github.com/insubstantialSwingX"
licenses {
license {
name 'BSD License'
url 'http://www.opensource.org/licenses/bsd-license.php'
distribution 'repo'
comments "Does not cover the Xoetrope Color Wheel"
}
license {
name 'Mozilla Public License 1.1'
url 'http://www.opensource.org/licenses/mozilla1.1'
distribution 'repo'
comments "Covers the Xoetrope Color Wheel"
}
}
scm {
connection 'scm:git:git@github.com:Insubstantial/insubstantialPeacock.git'
developerConnection 'scm:git:git@github.com:Insubstantial/insubstantialPeacock.git'
url 'scm:git:git@github.com:Insubstantial/insubstantialPeacock.git'
}
developers {
developer {
name 'Kirill Grouchnikov'
email 'kirillcool@yahoo.com'
roles {
role 'author'
role 'developer'
}
}
developer {
name 'Danno Ferrin'
email 'danno.ferrin@shemnon.com'
roles {
role 'maintainer'
}
}
}
}
}
}
}



8 changes: 0 additions & 8 deletions build.properties

This file was deleted.

Loading