Skip to content

Commit 3aa6e9a

Browse files
committed
updated links
1 parent 812b835 commit 3aa6e9a

File tree

7 files changed

+27
-14
lines changed

7 files changed

+27
-14
lines changed

mode/libraries/ar/library.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
name = AR
22
authorList = The Processing Foundation, Syam Sundar K
3-
url = http://android.processing.org
3+
url = https://android.processing.org
44
category = 3D
55
sentence = Renderer to develop AR apps
66
paragraph =

mode/libraries/vr/library.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
name = VR
22
authorList = Processing Foundation
3-
url = http://android.processing.org
3+
url = https://android.processing.org
44
category = 3D
55
sentence = Renderer to develop VR apps
66
paragraph =

mode/src/processing/mode/android/AVD.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ public class AVD {
4545
public final static String DEFAULT_WEAR_PORT = "5576";
4646

4747
private static final String GETTING_START_TUT_URL =
48-
"http://android.processing.org/tutorials/getting_started/index.html";
48+
"https://android.processing.org/tutorials/getting_started/index.html";
4949

5050
static final String DEVICE_DEFINITION = "pixel_6";
5151
static final String DEVICE_SKIN = "pixel_6";

mode/src/processing/mode/android/AndroidEditor.java

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -348,7 +348,10 @@ public JMenu buildHelpMenu() {
348348
item = new JMenuItem(AndroidMode.getTextString("menu.help.processing_for_android_site"));
349349
item.addActionListener(new ActionListener() {
350350
public void actionPerformed(ActionEvent e) {
351-
Platform.openURL("http://android.processing.org/");
351+
// Platform.openURL("https://android.processing.org/");
352+
String BLUETOOTH_DEBUG_URL = "https://android.processing.org/";
353+
AndroidUtil.showMessage(AndroidMode.getTextString("android_mode.dialog.watchface_debug_title"),
354+
AndroidMode.getTextString("android_mode.dialog.watchface_debug_body", BLUETOOTH_DEBUG_URL));
352355
}
353356
});
354357
menu.add(item);
@@ -357,7 +360,7 @@ public void actionPerformed(ActionEvent e) {
357360
item = new JMenuItem(AndroidMode.getTextString("menu.help.android_developer_site"));
358361
item.addActionListener(new ActionListener() {
359362
public void actionPerformed(ActionEvent e) {
360-
Platform.openURL("http://developer.android.com/");
363+
Platform.openURL("https://developer.android.com/");
361364
}
362365
});
363366
menu.add(item);

mode/src/processing/mode/android/AndroidMode.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,10 +65,10 @@ public class AndroidMode extends JavaMode {
6565
private static final String VERSIONS_FILE = "version.properties";
6666

6767
private static final String BLUETOOTH_DEBUG_URL =
68-
"https://developer.android.com/training/wearables/apps/debugging.html";
68+
"https://developer.android.com/training/wearables/get-started/debugging";
6969

7070
private static final String DISTRIBUTING_APPS_TUT_URL =
71-
"http://android.processing.org/tutorials/distributing/index.html";
71+
"https://android.processing.org/tutorials/distributing/index.html";
7272

7373
public AndroidMode(Base base, File folder) {
7474
super(base, folder);

mode/src/processing/mode/android/AndroidSDK.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -73,13 +73,13 @@ class AndroidSDK {
7373
private File emulator;
7474

7575
private static final String SDK_DOWNLOAD_URL =
76-
"https://developer.android.com/studio/index.html#downloads";
76+
"https://developer.android.com/studio/index.html#android-studio-downloads";
7777

7878
private static final String PROCESSING_FOR_ANDROID_URL =
79-
"http://android.processing.org/";
79+
"https://android.processing.org/";
8080

8181
private static final String WHATS_NEW_URL =
82-
"http://android.processing.org/whatsnew.html";
82+
"https://developer.android.com/studio/index.html";
8383

8484
private static final String DRIVER_INSTALL_URL =
8585
"https://developer.android.com/studio/run/oem-usb.html#InstallingDriver";

mode/src/processing/mode/android/AndroidUtil.java

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,7 @@ public class AndroidUtil {
6666

6767
// Creates a message dialog, where the text can contain clickable links.
6868
static public void showMessage(String title, String text) {
69+
System.out.println(text);
6970
if (title == null) title = "Message";
7071
if (Base.isCommandLine()) {
7172
System.out.println(title + ": " + text);
@@ -76,17 +77,26 @@ static public void showMessage(String title, String text) {
7677
"margin: " + TEXT_MARGIN + "px; " +
7778
"width: " + TEXT_WIDTH + "px }" +
7879
"</style> </head>" +
79-
"<body> <p>" + text + "</p> </body> </html>";
80-
JEditorPane pane = new JEditorPane("text/html", htmlString);
80+
"<body> <p>" + text + "</p> </body> </html>";
81+
JEditorPane pane = new JEditorPane();
82+
pane.setContentType("text/html");
83+
pane.setText(htmlString);
84+
pane.setEditable(false);
85+
8186
pane.addHyperlinkListener(new HyperlinkListener() {
8287
@Override
8388
public void hyperlinkUpdate(HyperlinkEvent e) {
8489
if (e.getEventType().equals(HyperlinkEvent.EventType.ACTIVATED)) {
85-
Platform.openURL(e.getURL().toString());
90+
if (e.getURL() != null) {
91+
Platform.openURL(e.getURL().toString());
92+
} else {
93+
String description = e.getDescription();
94+
System.err.println("Cannot open this URL " + description);
95+
}
8696
}
8797
}
8898
});
89-
pane.setEditable(false);
99+
90100
JLabel label = new JLabel();
91101
pane.setBackground(label.getBackground());
92102
JOptionPane.showMessageDialog(null, pane, title,

0 commit comments

Comments
 (0)