Author: xcoulon Date: 2012-04-23 11:55:41 -0400 (Mon, 23 Apr 2012) New Revision: 40409 Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/property/ApplicationPropertySource.java trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/CreationLogDialog.java trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/EmbedCartridgeWizardPage.java trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/EmbedCartridgeWizardPageModel.java Log: In progress - https://issues.jboss.org/browse/JBIDE-11400 Migrate current openshift plugins to the new RESTful client library Fixed - https://issues.jboss.org/browse/JBIDE-11195 Consider renaming "OpenShift Express Console" to "OpenShift Explorer" or "OpenShift Navigator" Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/property/ApplicationPropertySource.java =================================================================== --- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/property/ApplicationPropertySource.java 2012-04-23 15:55:38 UTC (rev 40408) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/property/ApplicationPropertySource.java 2012-04-23 15:55:41 UTC (rev 40409) @@ -63,7 +63,7 @@ } if (id.equals("2.Type")) { - return application.getCartridge(); + return application.getCartridge().getName(); } if (id.equals("5.Git URI")) { return application.getGitUrl(); Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/CreationLogDialog.java =================================================================== --- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/CreationLogDialog.java 2012-04-23 15:55:38 UTC (rev 40408) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/CreationLogDialog.java 2012-04-23 15:55:41 UTC (rev 40409) @@ -180,17 +180,19 @@ } private void createLinks(String log, int baseIndex, List<StyleRange> styles) { - Matcher matcher = HTTP_LINK_REGEX.matcher(log); - while (matcher.find() - && matcher.groupCount() == 1) { - int linkStart = matcher.start() + baseIndex; - int linkStop = matcher.end() + baseIndex; - StyleRange linkStyle = createLinkStyleRange(linkStart, linkStop); - styles.add(linkStyle); - String url = matcher.group(1); - LinkSubstring linkEntry = - new LinkSubstring(linkStart, linkStop, url); - linkSubstrings.add(linkEntry); + if(log != null) { + Matcher matcher = HTTP_LINK_REGEX.matcher(log); + while (matcher.find() + && matcher.groupCount() == 1) { + int linkStart = matcher.start() + baseIndex; + int linkStop = matcher.end() + baseIndex; + StyleRange linkStyle = createLinkStyleRange(linkStart, linkStop); + styles.add(linkStyle); + String url = matcher.group(1); + LinkSubstring linkEntry = + new LinkSubstring(linkStart, linkStop, url); + linkSubstrings.add(linkEntry); + } } } Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/EmbedCartridgeWizardPage.java =================================================================== --- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/EmbedCartridgeWizardPage.java 2012-04-23 15:55:38 UTC (rev 40408) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/EmbedCartridgeWizardPage.java 2012-04-23 15:55:41 UTC (rev 40409) @@ -118,7 +118,7 @@ @Override public void update(ViewerCell cell) { - IEmbeddedCartridge cartridge = (IEmbeddedCartridge) cell.getElement(); + IEmbeddableCartridge cartridge = (IEmbeddableCartridge) cell.getElement(); cell.setText(cartridge.getName()); } }, viewer, tableLayout); @@ -130,7 +130,6 @@ TableViewerColumn column = new TableViewerColumn(viewer, SWT.LEFT); column.getColumn().setText(name); column.setLabelProvider(cellLabelProvider); - layout.setColumnData(column.getColumn(), new ColumnWeightData(weight, true)); } @@ -140,7 +139,7 @@ @Override public void checkStateChanged(CheckStateChangedEvent event) { try { - IEmbeddedCartridge cartridge = (IEmbeddedCartridge) event.getElement(); + IEmbeddableCartridge cartridge = (IEmbeddableCartridge) event.getElement(); if (event.getChecked()) { if (IEmbeddedCartridge.PHPMYADMIN_34.equals(cartridge)) { addPhpMyAdminCartridge(cartridge); @@ -210,7 +209,7 @@ } } - private void addPhpMyAdminCartridge(IEmbeddedCartridge cartridge) throws OpenShiftException, SocketTimeoutException { + private void addPhpMyAdminCartridge(IEmbeddableCartridge cartridge) throws OpenShiftException, SocketTimeoutException { if (!viewer.getChecked(IEmbeddedCartridge.MYSQL_51)) { if (MessageDialog.openQuestion(getShell(), "Embed mysql cartridge", "To embed phpmyadmin, you'd also have to embed mysql.")) { @@ -225,11 +224,11 @@ } } - private void addCartridge(IEmbeddedCartridge cartridge) throws OpenShiftException, SocketTimeoutException { + private void addCartridge(IEmbeddableCartridge cartridge) throws OpenShiftException, SocketTimeoutException { model.getSelectedEmbeddableCartridges().add(cartridge); } - private void removeMySQLCartridge(IEmbeddedCartridge cartridge) throws OpenShiftException, SocketTimeoutException { + private void removeMySQLCartridge(IEmbeddableCartridge cartridge) throws OpenShiftException, SocketTimeoutException { List<IEmbeddableCartridge> checkedCartridges = model.getSelectedEmbeddableCartridges(); if (viewer.getChecked(IEmbeddedCartridge.PHPMYADMIN_34)) { if (MessageDialog.openQuestion(getShell(), "Remove phpmyadmin cartridge", @@ -245,7 +244,7 @@ } } - private void removeCartridge(IEmbeddedCartridge cartridge) throws OpenShiftException, SocketTimeoutException { + private void removeCartridge(IEmbeddableCartridge cartridge) throws OpenShiftException, SocketTimeoutException { model.getSelectedEmbeddableCartridges().remove(cartridge); } Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/EmbedCartridgeWizardPageModel.java =================================================================== --- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/EmbedCartridgeWizardPageModel.java 2012-04-23 15:55:38 UTC (rev 40408) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/EmbedCartridgeWizardPageModel.java 2012-04-23 15:55:41 UTC (rev 40409) @@ -55,9 +55,7 @@ || application.getEmbeddedCartridges() == null) { return; } - for(IEmbeddedCartridge configuredCartridge : application.getEmbeddedCartridges()) { - selectedCartridges.add(configuredCartridge); - } + selectedCartridges.addAll(application.getEmbeddedCartridges()); } public List<IEmbeddableCartridge> loadEmbeddableCartridges() throws OpenShiftException, SocketTimeoutException { @@ -141,21 +139,21 @@ ListDiff listDiff = Diffs.computeListDiff(getApplication().getEmbeddedCartridges(), selectedCartridges); for (ListDiffEntry entry : listDiff.getDifferences()) { if (entry.isAddition()) { - addedCartridges.add((IEmbeddedCartridge) entry.getElement()); + addedCartridges.add((IEmbeddableCartridge) entry.getElement()); } else { - removedCartridges.add((IEmbeddedCartridge) entry.getElement()); + removedCartridges.add((IEmbeddableCartridge) entry.getElement()); } } } - private static class CartridgeComparator implements Comparator<IEmbeddedCartridge> { + private static class CartridgeComparator implements Comparator<IEmbeddableCartridge> { @Override - public int compare(IEmbeddedCartridge thisCartridge, IEmbeddedCartridge thatCartridge) { + public int compare(IEmbeddableCartridge thisCartridge, IEmbeddableCartridge thatCartridge) { // mysql has to be added/removed before phpmyadmin - if (thisCartridge.equals(IEmbeddedCartridge.MYSQL_51)) { + if (thisCartridge.equals(IEmbeddableCartridge.MYSQL_51)) { return -1; - } else if (thatCartridge.equals(IEmbeddedCartridge.MYSQL_51)) { + } else if (thatCartridge.equals(IEmbeddableCartridge.MYSQL_51)) { return 1; } return 0;