X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=org.argeo.slc.client.ui.dist%2Fsrc%2Forg%2Fargeo%2Fslc%2Fclient%2Fui%2Fdist%2Feditors%2FModularDistVersionOverviewPage.java;h=0bd922fa28414e6b3ee2fa2e6e3f718bd405259a;hb=f59056d0b805cb91f524671a28b8780338509ba4;hp=00a5852522f5d47fdb803b7afeb9039a93340a6a;hpb=2db415932b071525adb52c6374e021174512a924;p=gpl%2Fargeo-slc.git diff --git a/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/editors/ModularDistVersionOverviewPage.java b/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/editors/ModularDistVersionOverviewPage.java index 00a585252..0bd922fa2 100644 --- a/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/editors/ModularDistVersionOverviewPage.java +++ b/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/editors/ModularDistVersionOverviewPage.java @@ -35,22 +35,24 @@ import javax.jcr.query.qom.QueryObjectModelFactory; import javax.jcr.query.qom.Selector; import javax.jcr.query.qom.StaticOperand; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.argeo.cms.ui.workbench.util.CommandUtils; import org.argeo.eclipse.ui.EclipseUiUtils; -import org.argeo.eclipse.ui.workbench.CommandUtils; import org.argeo.jcr.JcrUtils; import org.argeo.slc.SlcException; +import org.argeo.slc.SlcNames; +import org.argeo.slc.SlcTypes; import org.argeo.slc.client.ui.dist.DistConstants; import org.argeo.slc.client.ui.dist.DistImages; import org.argeo.slc.client.ui.dist.commands.OpenModuleEditor; -import org.argeo.slc.client.ui.dist.utils.AbstractHyperlinkListener; import org.argeo.slc.client.ui.dist.utils.DistNodeViewerComparator; -import org.argeo.slc.client.ui.specific.OpenJcrFile; -import org.argeo.slc.client.ui.specific.OpenJcrFileCmdId; -import org.argeo.slc.jcr.SlcNames; -import org.argeo.slc.jcr.SlcTypes; +import org.argeo.slc.client.ui.dist.utils.HyperlinkAdapter; import org.argeo.slc.repo.RepoConstants; import org.argeo.slc.repo.RepoUtils; import org.argeo.slc.repo.maven.MavenConventionsUtils; +import org.eclipse.aether.artifact.Artifact; +import org.eclipse.aether.artifact.DefaultArtifact; import org.eclipse.jface.dialogs.IMessageProvider; import org.eclipse.jface.viewers.ColumnLabelProvider; import org.eclipse.jface.viewers.DoubleClickEvent; @@ -83,8 +85,6 @@ import org.eclipse.ui.forms.events.HyperlinkEvent; import org.eclipse.ui.forms.widgets.FormToolkit; import org.eclipse.ui.forms.widgets.Hyperlink; import org.eclipse.ui.forms.widgets.ScrolledForm; -import org.eclipse.aether.artifact.Artifact; -import org.eclipse.aether.artifact.DefaultArtifact; /** * Show all modules contained in a given modular distribution as filter-able @@ -93,6 +93,9 @@ import org.eclipse.aether.artifact.DefaultArtifact; public class ModularDistVersionOverviewPage extends FormPage implements SlcNames { + private final static Log log = LogFactory + .getLog(ModularDistVersionOverviewPage.class); + final static String PAGE_ID = "ModularDistVersionOverviewPage"; // Business Objects @@ -209,7 +212,7 @@ public class ModularDistVersionOverviewPage extends FormPage implements final Hyperlink link = tk.createHyperlink(parent, modularDistribution.getProperty(jcrPropName).getString(), SWT.NONE); - link.addHyperlinkListener(new AbstractHyperlinkListener() { + link.addHyperlinkListener(new HyperlinkAdapter() { @Override public void linkActivated(HyperlinkEvent e) { try { @@ -263,7 +266,7 @@ public class ModularDistVersionOverviewPage extends FormPage implements } } - private class OpenFileLinkListener extends AbstractHyperlinkListener { + private class OpenFileLinkListener extends HyperlinkAdapter { final private String path; public OpenFileLinkListener(String path) { @@ -272,21 +275,25 @@ public class ModularDistVersionOverviewPage extends FormPage implements @Override public void linkActivated(HyperlinkEvent e) { - try { - ModuleEditorInput editorInput = (ModuleEditorInput) getEditorInput(); - Map params = new HashMap(); - params.put(OpenJcrFile.PARAM_REPO_NODE_PATH, - editorInput.getRepoNodePath()); - params.put(OpenJcrFile.PARAM_REPO_URI, editorInput.getUri()); - params.put(OpenJcrFile.PARAM_WORKSPACE_NAME, - editorInput.getWorkspaceName()); - params.put(OpenJcrFile.PARAM_FILE_PATH, path); - - String cmdId = (new OpenJcrFileCmdId()).getCmdId(); - CommandUtils.callCommand(cmdId, params); - } catch (Exception ex) { - throw new SlcException("error opening browser", ex); //$NON-NLS-1$ - } + log.warn("File download must be implemented. Cannot provide access to " + + path); + + // try { + // ModuleEditorInput editorInput = (ModuleEditorInput) + // getEditorInput(); + // Map params = new HashMap(); + // params.put(OpenJcrFile.PARAM_REPO_NODE_PATH, + // editorInput.getRepoNodePath()); + // params.put(OpenJcrFile.PARAM_REPO_URI, editorInput.getUri()); + // params.put(OpenJcrFile.PARAM_WORKSPACE_NAME, + // editorInput.getWorkspaceName()); + // params.put(OpenJcrFile.PARAM_FILE_PATH, path); + // + // String cmdId = (new OpenJcrFileCmdId()).getCmdId(); + // CommandUtils.callCommand(cmdId, params); + // } catch (Exception ex) { + // throw new SlcException("error opening browser", ex); //$NON-NLS-1$ + // } } } @@ -326,6 +333,8 @@ public class ModularDistVersionOverviewPage extends FormPage implements filterTxt.setMessage(FILTER_HELP_MSG); filterTxt.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, false)); filterTxt.addModifyListener(new ModifyListener() { + private static final long serialVersionUID = -276152321986407726L; + public void modifyText(ModifyEvent event) { refresh(); } @@ -334,6 +343,8 @@ public class ModularDistVersionOverviewPage extends FormPage implements Button resetBtn = tk.createButton(parent, null, SWT.PUSH); resetBtn.setImage(DistImages.IMG_CLEAR); resetBtn.addSelectionListener(new SelectionAdapter() { + private static final long serialVersionUID = -3549303742841670919L; + public void widgetSelected(SelectionEvent e) { filterTxt.setText(""); filterTxt.setMessage(FILTER_HELP_MSG); @@ -356,6 +367,8 @@ public class ModularDistVersionOverviewPage extends FormPage implements col.getColumn().setWidth(220); col.getColumn().setText("Category"); col.setLabelProvider(new ColumnLabelProvider() { + private static final long serialVersionUID = 5875398301711336875L; + @Override public String getText(Object element) { return JcrUtils.get((Node) element, SlcNames.SLC_CATEGORY); @@ -370,6 +383,8 @@ public class ModularDistVersionOverviewPage extends FormPage implements col.getColumn().setWidth(220); col.getColumn().setText("Name"); col.setLabelProvider(new ColumnLabelProvider() { + private static final long serialVersionUID = 3880240676256465072L; + @Override public String getText(Object element) { return JcrUtils.get((Node) element, SLC_NAME); @@ -384,6 +399,8 @@ public class ModularDistVersionOverviewPage extends FormPage implements col.getColumn().setWidth(160); col.getColumn().setText("Version"); col.setLabelProvider(new ColumnLabelProvider() { + private static final long serialVersionUID = -4706438113850571784L; + @Override public String getText(Object element) { return JcrUtils.get((Node) element, SLC_VERSION); @@ -398,6 +415,8 @@ public class ModularDistVersionOverviewPage extends FormPage implements col.getColumn().setWidth(160); col.getColumn().setText("Exists in workspace"); col.setLabelProvider(new ColumnLabelProvider() { + private static final long serialVersionUID = 8190063212920414300L; + @Override public String getText(Object element) { return getRealizedModule((Node) element) != null ? "Yes" : "No"; @@ -546,6 +565,8 @@ public class ModularDistVersionOverviewPage extends FormPage implements private SelectionAdapter getSelectionAdapter(final int index) { SelectionAdapter selectionAdapter = new SelectionAdapter() { + private static final long serialVersionUID = 1260801795934660840L; + @Override public void widgetSelected(SelectionEvent e) { Table table = viewer.getTable(); @@ -567,6 +588,7 @@ public class ModularDistVersionOverviewPage extends FormPage implements /* LOCAL CLASSES */ private class DistributionsContentProvider implements IStructuredContentProvider { + private static final long serialVersionUID = 8385338190908823791L; // we keep a cache of the Nodes in the content provider to be able to // manage long request private List nodes;