| FazBrowse GitHub Viewer | Trending | | Home |
| Tools: [Download Repo ZIP] [Original HTTPS Page] |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -52,6 +52,6 @@ public void paint(Graphics g) { | |||
| 52 | 52 | ||
| 53 | 53 | g.setFont(new Font("SansSerif", Font.PLAIN, 11)); //$NON-NLS-1$ | |
| 54 | 54 | g.setColor(Color.white); | |
| 55 | - g.drawString(Base.VERSION_NAME, 50, 30); | ||
| 55 | + g.drawString(Base.getVersionName(), 50, 30); | ||
| 56 | 56 | } | |
| 57 | 57 | } | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -44,11 +44,13 @@ | |||
| 44 | 44 | * files and images, etc) that comes from that. | |
| 45 | 45 | */ | |
| 46 | 46 | public class Base { | |
| 47 | - static public final int REVISION = 218; | ||
| 47 | + // Added accessors for 0218 because the UpdateCheck class was not properly | ||
| 48 | + // updating the values, because javac was inlining the static final values. | ||
| 49 | + static private final int REVISION = 218; | ||
| 48 | 50 | /** This might be replaced by main() if there's a lib/version.txt file. */ | |
| 49 | - static public String VERSION_NAME = "0218"; //$NON-NLS-1$ | ||
| 51 | + static private String VERSION_NAME = "0218"; //$NON-NLS-1$ | ||
| 50 | 52 | /** Set true if this a proper release rather than a numbered revision. */ | |
| 51 | - static public boolean RELEASE = false; | ||
| 53 | + // static private boolean RELEASE = false; | ||
| 52 | 54 | ||
| 53 | 55 | /** True if heavy debugging error/log messages are enabled */ | |
| 54 | 56 | static public boolean DEBUG = false; | |
@@ -147,7 +149,7 @@ static private void createAndShowGUI(String[] args) { | |||
| 147 | 149 | String version = PApplet.loadStrings(versionFile)[0]; | |
| 148 | 150 | if (!version.equals(VERSION_NAME)) { | |
| 149 | 151 | VERSION_NAME = version; | |
| 150 | - RELEASE = true; | ||
| 152 | + // RELEASE = true; | ||
| 151 | 153 | } | |
| 152 | 154 | } | |
| 153 | 155 | } catch (Exception e) { | |
@@ -1547,33 +1549,25 @@ public void handleShowUpdates() { | |||
| 1547 | 1549 | updateManagerFrame.showFrame(activeEditor); | |
| 1548 | 1550 | } | |
| 1549 | 1551 | ||
| 1552 | + | ||
| 1550 | 1553 | // ................................................................... | |
| 1551 | 1554 | ||
| 1552 | 1555 | ||
| 1556 | + static public int getRevision() { | ||
| 1557 | + return REVISION; | ||
| 1558 | + } | ||
| 1559 | + | ||
| 1560 | + | ||
| 1553 | 1561 | /** | |
| 1554 | - * Get list of platform constants. | ||
| 1562 | + * Return the version name, something like 1.5 or 2.0b8 or 0213 if it's not | ||
| 1563 | + * a release version. | ||
| 1555 | 1564 | */ | |
| 1556 | - // static public int[] getPlatforms() { | ||
| 1557 | - // return platforms; | ||
| 1558 | - // } | ||
| 1559 | - | ||
| 1565 | + static public String getVersionName() { | ||
| 1566 | + return VERSION_NAME; | ||
| 1567 | + } | ||
| 1560 | 1568 | ||
| 1561 | - // static public int getPlatform() { | ||
| 1562 | - // String osname = System.getProperty("os.name"); | ||
| 1563 | - // | ||
| 1564 | - // if (osname.indexOf("Mac") != -1) { | ||
| 1565 | - // return PConstants.MACOSX; | ||
| 1566 | - // | ||
| 1567 | - // } else if (osname.indexOf("Windows") != -1) { | ||
| 1568 | - // return PConstants.WINDOWS; | ||
| 1569 | - // | ||
| 1570 | - // } else if (osname.equals("Linux")) { // true for the ibm vm | ||
| 1571 | - // return PConstants.LINUX; | ||
| 1572 | - // | ||
| 1573 | - // } else { | ||
| 1574 | - // return PConstants.OTHER; | ||
| 1575 | - // } | ||
| 1576 | - // } | ||
| 1569 | + | ||
| 1570 | + //................................................................... | ||
| 1577 | 1571 | ||
| 1578 | 1572 | ||
| 1579 | 1573 | static public Platform getPlatform() { | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -2215,7 +2215,7 @@ protected boolean handleOpenInternal(String path) { | |||
| 2215 | 2215 | * something like "sketch_070752a - Processing 0126" | |
| 2216 | 2216 | */ | |
| 2217 | 2217 | public void updateTitle() { | |
| 2218 | - setTitle(sketch.getName() + " | Processing " + Base.VERSION_NAME); | ||
| 2218 | + setTitle(sketch.getName() + " | Processing " + Base.getVersionName()); | ||
| 2219 | 2219 | ||
| 2220 | 2220 | if (!sketch.isUntitled()) { | |
| 2221 | 2221 | // set current file for OS X so that cmd-click in title bar works | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -88,7 +88,7 @@ public void updateCheck() throws Exception { | |||
| 88 | 88 | } | |
| 89 | 89 | ||
| 90 | 90 | String info = PApplet.urlEncode(id + "\t" + | |
| 91 | - PApplet.nf(Base.REVISION, 4) + "\t" + | ||
| 91 | + PApplet.nf(Base.getRevision(), 4) + "\t" + | ||
| 92 | 92 | System.getProperty("java.version") + "\t" + | |
| 93 | 93 | System.getProperty("java.vendor") + "\t" + | |
| 94 | 94 | System.getProperty("os.name") + "\t" + | |
@@ -111,9 +111,9 @@ public void updateCheck() throws Exception { | |||
| 111 | 111 | if (base.activeEditor != null) { | |
| 112 | 112 | boolean offerToUpdateContributions = true; | |
| 113 | 113 | ||
| 114 | - if (latest > Base.REVISION) { | ||
| 114 | + if (latest > Base.getRevision()) { | ||
| 115 | 115 | System.out.println("You are running Processing revision " + | |
| 116 | - Base.REVISION + ", the latest is " + latest + "."); | ||
| 116 | + Base.getRevision() + ", the latest is " + latest + "."); | ||
| 117 | 117 | // Assume the person is busy downloading the latest version | |
| 118 | 118 | offerToUpdateContributions = !promptToVisitDownloadPage(); | |
| 119 | 119 | } | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -345,7 +345,7 @@ void complainAndQuit(String lastWords, boolean schoolEmFirst) { | |||
| 345 | 345 | ||
| 346 | 346 | static void printCommandLine(PrintStream out) { | |
| 347 | 347 | out.println(); | |
| 348 | - out.println("Command line edition for Processing " + Base.VERSION_NAME + " (Java Mode)"); | ||
| 348 | + out.println("Command line edition for Processing " + Base.getVersionName() + " (Java Mode)"); | ||
| 349 | 349 | out.println(); | |
| 350 | 350 | out.println("--help Show this help text. Congratulations."); | |
| 351 | 351 | out.println(); | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -1529,7 +1529,7 @@ protected void addManifest(ZipOutputStream zos) throws IOException { | |||
| 1529 | 1529 | ||
| 1530 | 1530 | String contents = | |
| 1531 | 1531 | "Manifest-Version: 1.0\n" + | |
| 1532 | - "Created-By: Processing " + Base.VERSION_NAME + "\n" + | ||
| 1532 | + "Created-By: Processing " + Base.getVersionName() + "\n" + | ||
| 1533 | 1533 | "Main-Class: " + sketch.getName() + "\n"; // TODO not package friendly | |
| 1534 | 1534 | zos.write(contents.getBytes()); | |
| 1535 | 1535 | zos.closeEntry(); | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -29,6 +29,9 @@ A Implement textMode(SHAPE) for 3D | |||
| 29 | 29 | A https://github.com/processing/processing/issues/777 | |
| 30 | 30 | A PImage.loadPixels() shouldn't be calling out to the renderer | |
| 31 | 31 | A setting image.parent = null for it makes it work again for get().save() case | |
| 32 | + A Setting smooth(n) affects disables background in setup() | ||
| 33 | + A https://github.com/processing/processing/issues/1452 | ||
| 34 | + | ||
| 32 | 35 | ||
| 33 | 36 | _ data decision stuff | |
| 34 | 37 | _ key/valueIterator to get a version that can be removed in a loop | |
| Back | FazBrowse Home | New Git URL |
0 commit comments