Skip to content

Commit 101229f

Browse files
author
jantje
committed
Moving remind logic to web site
Also fixed 2 warning issue
1 parent 0f957dc commit 101229f

File tree

6 files changed

+26
-15
lines changed

6 files changed

+26
-15
lines changed

Eclipse update site/WebContent/index.shtml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
<p>This is about a free, open source, <b>Eclipse</b> plug-in to ease your development efforts!<br>
4040
As you only need the Arduino IDE, Eclipse and this plug-in this represents a completely free and open Arduino IDE alternative.
4141
</p>
42-
<p>[!!!V3 will be released the 1the of April: only the product download is needed!!!!](http://blog.baeyens.it/#post26)</p>
42+
<p><a href="http://blog.baeyens.it/#post26">!!!V3 will be released the 1the of April: only the product download is needed!!!!</a></p>
4343
<p>Welcome to a next stage for your Arduino projects!</p>
4444
<p>
4545
<a href="learn.shtml" class="btn btn-primary btn-lg" role="button">Learn more &raquo;</a>
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
<?php include 'remind3_0.html';?>

Eclipse update site/WebContent/remind3_0.html

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,14 @@
99
<div id="header">
1010
<a href="http://www.eclipse.org/"><img src="http://download.eclipse.org/eclipse/eclipse.org-common/stylesheets/header_logo.gif" width="163" height="68" border="0" alt="Eclipse Logo" class="logo" /></a>
1111
</div>
12+
<div>
1213
<h1>So, you think Jantje and the contributors did a great job?</h1>
1314
<h2><a href="https://www.patreon.com/jantje?ty=h">Why don't you show it?</a></h2>
14-
<div>
15-
<a href="http://goo.gl/forms/pxHR7XrCuA"><img src="http://en.ancestris.org/images/0/0a/We_need_you.jpg" style="float:right"></a>
16-
<h3>"V3 needs testers!"</h3>
17-
<h4>If you are willing to dedicate some testing time to the project, please consider membership of <a href="https://groups.google.com/forum/#!forum/arduino-eclipse-plugin">plugin testers</a></h4>
18-
<h3>"Feel like contributing?"</h3>
19-
<h4>If you are willing to dedicate some java development time to the project, please send a mail with subject "subscribe" to <a href="mailto:[email protected]?SUBJECT=subscribe">[email protected]</a></h4>
15+
<p>Or simply clik the button below!</p>
16+
<a href="https://www.patreon.com/bePatron?u=798640&redirect_uri=http%3A%2F%2Fpatron.baeyens.it%2Fthanks.php">
17+
<img height="40" width="204" src="https://s3-us-west-1.amazonaws.com/widget-images/become-patron-widget-medium%402x.png">
18+
</a>
19+
<p>Note that 1 dollar a month makes a world of difference to us.</p>
2020
</div>
2121

2222
<div>

it.baeyens.arduino.common/src/it/baeyens/arduino/common/Activator.java

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ public static Activator getDefault() {
5151
private static final String uploadflag = "F" + "u" + "S" + "t" + "a" + "t" + "u" + "s"; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ //$NON-NLS-7$ //$NON-NLS-8$
5252
private static final String buildflag = "F" + "u" + "S" + "t" + "a" + "t" + "u" + "b"; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ //$NON-NLS-7$ //$NON-NLS-8$
5353
private static final String Localflag = "l" + flagStart; //$NON-NLS-1$
54-
private static final String helploc = "http://www.baeyens.it/eclipse/remind3_0.html"; //$NON-NLS-1$
54+
private static final String helploc = "http://www.baeyens.it/eclipse/remind.php"; //$NON-NLS-1$
5555

5656
/**
5757
* The constructor
@@ -63,7 +63,8 @@ public Activator() {
6363
/*
6464
* (non-Javadoc)
6565
*
66-
* @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext )
66+
* @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.
67+
* BundleContext )
6768
*/
6869
@Override
6970
public void start(BundleContext context) throws Exception {
@@ -86,8 +87,8 @@ static void remind() {
8687
protected IStatus run(IProgressMonitor monitor) {
8788

8889
IEclipsePreferences myScope = InstanceScope.INSTANCE.getNode(Const.NODE_ARDUINO);
89-
int curFsiStatus = myScope.getInt(flagStart, 0) + myScope.getInt(flagMonitor, 0) + myScope.getInt(uploadflag, 0)
90-
+ myScope.getInt(buildflag, 0);
90+
int curFsiStatus = myScope.getInt(flagStart, 0) + myScope.getInt(flagMonitor, 0)
91+
+ myScope.getInt(uploadflag, 0) + myScope.getInt(buildflag, 0);
9192
int lastFsiStatus = myScope.getInt(Localflag, 0);
9293
if ((curFsiStatus - lastFsiStatus) > 50) {
9394
if (isInternetReachable()) {
@@ -113,7 +114,8 @@ protected IStatus run(IProgressMonitor monitor) {
113114
/*
114115
* (non-Javadoc)
115116
*
116-
* @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext )
117+
* @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.
118+
* BundleContext )
117119
*/
118120
@Override
119121
public void stop(BundleContext context) throws Exception {

it.baeyens.arduino.common/src/it/baeyens/arduino/common/PleaseHelp.java

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
import org.eclipse.swt.widgets.Control;
1515
import org.eclipse.swt.widgets.Shell;
1616
import org.eclipse.ui.PlatformUI;
17+
import org.osgi.framework.FrameworkUtil;
1718

1819
public class PleaseHelp extends Dialog {
1920

@@ -61,7 +62,14 @@ public void completed(ProgressEvent event) {
6162

6263
this.buttonBar = createButtonBar(parent);
6364

64-
this.browser.setUrl(myhelpLocation + "?os=" + Platform.getOS() + ";arch=" + Platform.getOSArch()); //$NON-NLS-1$ //$NON-NLS-2$
65+
org.osgi.framework.Version version = FrameworkUtil.getBundle(getClass()).getVersion();
66+
String url = myhelpLocation + "?os=" + Platform.getOS(); //$NON-NLS-1$
67+
url += ";arch=" + Platform.getOSArch(); //$NON-NLS-1$
68+
url += ";majorVersion=" + version.getMajor(); //$NON-NLS-1$
69+
url += ";minorVersion=" + version.getMinor(); //$NON-NLS-1$
70+
url += ";microVersion=" + version.getMicro(); //$NON-NLS-1$
71+
url += ";qualifierVersion=" + version.getQualifier(); //$NON-NLS-1$
72+
this.browser.setUrl(url);
6573

6674
return parent;
6775

it.baeyens.arduino.core/src/it/baeyens/arduino/toolchain/ArduinoLanguageProvider.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,7 @@ protected String getCompilerCommand(String languageId) {
175175
if (op2 != null) {
176176
compilerCommand = compilerCommand + ' ' + op2.getValue();
177177
}
178-
compilerCommand = compilerCommand + " -D" + Const.DEFINE_IN_ECLIPSE + "=1"; //$NON-NLS-1$
178+
compilerCommand = compilerCommand + " -D" + Const.DEFINE_IN_ECLIPSE + "=1"; //$NON-NLS-1$ //$NON-NLS-2$
179179
} else if (languageId.equals("org.eclipse.cdt.core.g++")) { //$NON-NLS-1$
180180
try {
181181
compilerCommand = envManager.getVariable(Const.ENV_KEY_recipe_cpp_o_pattern, confDesc, true).getValue()
@@ -193,7 +193,7 @@ protected String getCompilerCommand(String languageId) {
193193
if (op2 != null) {
194194
compilerCommand = compilerCommand + ' ' + op2.getValue();
195195
}
196-
compilerCommand = compilerCommand + " -D" + Const.DEFINE_IN_ECLIPSE + "=1"; //$NON-NLS-1$
196+
compilerCommand = compilerCommand + " -D" + Const.DEFINE_IN_ECLIPSE + "=1"; //$NON-NLS-1$ //$NON-NLS-2$
197197
} else {
198198
ManagedBuilderCorePlugin.error(
199199
"Unable to find compiler command for language " + languageId + " in toolchain=" + getToolchainId()); //$NON-NLS-1$ //$NON-NLS-2$

0 commit comments

Comments
 (0)