work more based on boardDescriptor

Author: jantje

io.sloeber.core/src/io/sloeber/core/api/Sketch.java

@@ -158,17 +158,13 @@ public static int getCodeBaudRate(IProject iProject) {
 	 * @return
 	 */
 	public static String getComport(IProject project) {
-		return Common.getBuildEnvironmentVariable(project, Const.ENV_KEY_JANTJE_UPLOAD_PORT, Const.EMPTY_STRING);
+		return BoardDescriptor.getUploadPort(project);
 	}
 
 	public static void reAttachLibrariesToProject(IProject iProject) {
 		Libraries.reAttachLibrariesToProject(iProject);
 	}
 
-	public static String getBoardName(IProject proj) {
-		return Common.getBuildEnvironmentVariable(proj, Const.ENV_KEY_JANTJE_BOARD_NAME, Const.EMPTY_STRING);
-	}
-
 	public static boolean isSketch(IProject proj) {
 		try {
 			return proj.hasNature(Const.ARDUINO_NATURE_ID);

io.sloeber.ui/src/io/sloeber/ui/ExplorerLabelDecorator.java

@@ -1,60 +1,67 @@
 package io.sloeber.ui;
 
+import org.eclipse.cdt.core.model.CoreModel;
+import org.eclipse.cdt.core.settings.model.ICConfigurationDescription;
+import org.eclipse.cdt.core.settings.model.ICProjectDescription;
 import org.eclipse.core.resources.IProject;
 import org.eclipse.jface.viewers.ILabelDecorator;
 import org.eclipse.jface.viewers.ILabelProviderListener;
 import org.eclipse.swt.graphics.Image;
 
+import io.sloeber.core.api.BoardDescriptor;
 import io.sloeber.core.api.Sketch;
 
 public class ExplorerLabelDecorator implements ILabelDecorator {
 
-    @Override
-    public void addListener(ILabelProviderListener listener) {
-	// nothing to do here
+	@Override
+	public void addListener(ILabelProviderListener listener) {
+		// nothing to do here
 
-    }
+	}
 
-    @Override
-    public void dispose() {
-	// nothing to do here
+	@Override
+	public void dispose() {
+		// nothing to do here
 
-    }
+	}
 
-    @Override
-    public boolean isLabelProperty(Object element, String property) {
-	return false;
-    }
+	@Override
+	public boolean isLabelProperty(Object element, String property) {
+		return false;
+	}
 
-    @Override
-    public void removeListener(ILabelProviderListener listener) {
-	// nothing to do here
+	@Override
+	public void removeListener(ILabelProviderListener listener) {
+		// nothing to do here
 
-    }
+	}
 
-    @Override
-    public Image decorateImage(Image image, Object element) {
-	return null;
-    }
+	@Override
+	public Image decorateImage(Image image, Object element) {
+		return null;
+	}
 
-    @Override
-    public String decorateText(String text, Object element) {
-	IProject proj = (IProject) element;
-	if (proj.isOpen()) {
-	    if (Sketch.isSketch(proj)) {
-		String boardName = Sketch.getBoardName(proj);
-		String portName = Sketch.getComport(proj);
-		if (portName.isEmpty()) {
-		    portName = "no port"; //$NON-NLS-1$
-		}
-		if (boardName.isEmpty()) {
-		    boardName = "no Board"; //$NON-NLS-1$
+	@Override
+	public String decorateText(String text, Object element) {
+		IProject proj = (IProject) element;
+		if (proj.isOpen()) {
+			if (Sketch.isSketch(proj)) {
+				ICProjectDescription prjDesc = CoreModel.getDefault().getProjectDescription(proj);
+				ICConfigurationDescription configurationDescription = prjDesc.getActiveConfiguration();
+				BoardDescriptor boardDescriptor = BoardDescriptor.makeBoardDescriptor(configurationDescription);
+				String boardName = boardDescriptor.getBoardName();
+				String portName = boardDescriptor.getUploadPort();
+				if (portName.isEmpty()) {
+					portName = "no port"; //$NON-NLS-1$
+				}
+				if (boardName.isEmpty()) {
+					boardName = "no Board"; //$NON-NLS-1$
+				}
+				return text + ' ' + boardName + ' ' + ':' + portName;
+			}
 		}
-		return text + ' ' + boardName + ' ' + ':' + portName;
-	    }
-	}
 
-	return null;
-    }
+		return null;
+	}
 
 }