mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-07-13 12:05:21 +02:00
Code Issues Wiki Activity

[cleanup] Avoid Javadoc param tag on separate line

Browse source
This commit is contained in:
Martin Oberhuber 2008-03-16 20:18:30 +00:00
parent 3ea93ca975
commit dd3b95b989
3 changed files with 265 additions and 275 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
discovery/org.eclipse.tm.discovery.engine/schema/discoveryProtocol.exsd
View file

@ -66,7 +66,7 @@
<documentation> <documentation>
Allows specifying semicolon separated multicast addresses to be used with specific transports in the format &lt;transport&gt;:&lt;address&gt; Allows specifying semicolon separated multicast addresses to be used with specific transports in the format &lt;transport&gt;:&lt;address&gt;
An example would be: An example would be:
&lt;code&gt;&quot;transportName1:address1;transportName2:address2;UDP:224.0.0.251&quot;&lt;code/&gt; &lt;code&gt;&quot;transportName1:address1;transportName2:address2;UDP:224.0.0.251&quot;&lt;/code&gt;
</documentation> </documentation>
</annotation> </annotation>
</attribute> </attribute>

18
discovery/org.eclipse.tm.discovery.engine/src/org/eclipse/tm/discovery/protocol/IProtocol.java
View file

@ -29,19 +29,19 @@ public interface IProtocol {
/** /**
* Instantiates a Job to populate a model given an initial query, a resource containing the model to be populated and an ITranport implementation. * Instantiates a Job to populate a model given an initial query, a resource
* containing the model to be populated and an ITranport implementation.
* *
* @param query * @param query Initial query to be sent to the target. This initial query
* Initial query to be sent to the target. This initial query can be obtained from the getQueries() method. * can be obtained from the getQueries() method.
* *
* @param resource * @param resource Resource containing the model to be populated with the
* Resource containing the model to be populated with the results of the service discovery action. * results of the service discovery action.
* *
* @param transport * @param transport ITransport implementation of the transport to be used
* ITransport implementation of the transport to be used for the discovery action. * for the discovery action.
* *
* @return * @return Job containing the service discovery action.
* Job containing the service discovery action.
* *
* @see Job * @see Job
* @see Resource * @see Resource

262
discovery/org.eclipse.tm.discovery.wizard/src/org/eclipse/tm/internal/discovery/wizard/ServiceDiscoveryWizardDisplayPage.java
View file

@ -124,18 +124,14 @@ public class ServiceDiscoveryWizardDisplayPage extends WizardPage {
private Hashtable supportedServicesType = new Hashtable(); private Hashtable supportedServicesType = new Hashtable();
/** /**
* Constructor for the wizard page performing and displayin the results of the service discovery * Constructor for the wizard page performing and displayin the results of
* the service discovery
* *
* @param query * @param query Query for the service discovery action
* Query for the service discovery action * @param address Address of the target device
* @param address * @param transportName Name of the transport implementation to be used
* Address of the target device * @param protocolName Name of the protocol implementation to be used
* @param transportName * @param timeOut Timeout to be used in the transport
* Name of the transport implementation to be used
* @param protocolName
* Name of the protocol implementation to be used
* @param timeOut
* Timeout to be used in the transport
*/ */
public ServiceDiscoveryWizardDisplayPage(String query, String address, String transportName, String protocolName, int timeOut) { public ServiceDiscoveryWizardDisplayPage(String query, String address, String transportName, String protocolName, int timeOut) {
@ -189,16 +185,11 @@ public class ServiceDiscoveryWizardDisplayPage extends WizardPage {
/** /**
* Refresh the contents of the service discovery model * Refresh the contents of the service discovery model
* *
* @param query * @param query Query for the service discovery action
* Query for the service discovery action * @param address Address of the target device
* @param address * @param transportName Name of the transport implementation to be used
* Address of the target device * @param protocolName Name of the protocol implementation to be used
* @param transportName * @param timeOut Timeout to be used in the transport
* Name of the transport implementation to be used
* @param protocolName
* Name of the protocol implementation to be used
* @param timeOut
* Timeout to be used in the transport
*/ */
public void update(String query, String address, String transportName, String protocolName, int timeOut) public void update(String query, String address, String transportName, String protocolName, int timeOut)
{ {
@ -253,12 +244,12 @@ public class ServiceDiscoveryWizardDisplayPage extends WizardPage {
Composite comp = new Composite(parent, SWT.NULL); Composite comp = new Composite(parent, SWT.NULL);
GridLayout gridLayout = new GridLayout(); GridLayout gridLayout = new GridLayout();
gridLayout.numColumns = 1; gridLayout.numColumns = 1;
comp.setLayout(gridLayout); comp.setLayout(gridLayout);
//TOOLBAR //TOOLBAR
createToolBar(comp); createToolBar(comp);
GridData data = new GridData(); GridData data = new GridData();
data.horizontalAlignment = GridData.FILL; data.horizontalAlignment = GridData.FILL;
@ -382,15 +373,15 @@ public class ServiceDiscoveryWizardDisplayPage extends WizardPage {
((ContainerCheckedTreeViewer) viewerPaneTree.getViewer()).addCheckStateListener(new ICheckStateListener() { ((ContainerCheckedTreeViewer) viewerPaneTree.getViewer()).addCheckStateListener(new ICheckStateListener() {
public void checkStateChanged(CheckStateChangedEvent event) { public void checkStateChanged(CheckStateChangedEvent event) {
ContainerCheckedTreeViewer treeViewer = (ContainerCheckedTreeViewer) event.getSource(); ContainerCheckedTreeViewer treeViewer = (ContainerCheckedTreeViewer) event.getSource();
if(treeViewer.getCheckedElements().length > 0) if(treeViewer.getCheckedElements().length > 0)
setPageComplete(true); setPageComplete(true);
else else
setPageComplete(false); setPageComplete(false);
} }
}); });
filter = new ViewerFilter(){ filter = new ViewerFilter(){
@ -422,27 +413,27 @@ public class ServiceDiscoveryWizardDisplayPage extends WizardPage {
Pair pair = (Pair)it.next(); Pair pair = (Pair)it.next();
if(pair.getKey().equalsIgnoreCase("transport")) //$NON-NLS-1$ if(pair.getKey().equalsIgnoreCase("transport")) //$NON-NLS-1$
{ {
String transport = pair.getValue(); String transport = pair.getValue();
for (int i = 0; i < transports.size(); i++) { for (int i = 0; i < transports.size(); i++) {
if(((String)transports.elementAt(i)).equalsIgnoreCase(transport)) if(((String)transports.elementAt(i)).equalsIgnoreCase(transport))
{ {
//found a supported transport //found a supported transport
supported = true; supported = true;
}
} }
}
} }
} }
} }
return supported; return supported;
}}; }};
((ContainerCheckedTreeViewer) viewerPaneTree.getViewer()).addFilter(filter); ((ContainerCheckedTreeViewer) viewerPaneTree.getViewer()).addFilter(filter);
} }
@ -454,102 +445,102 @@ public class ServiceDiscoveryWizardDisplayPage extends WizardPage {
viewerPaneTable = viewerPaneTable =
new ViewerPane(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage(), new ViewerPane(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage(),
PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().getActivePart()) { PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().getActivePart()) {
public Viewer createViewer(Composite composite) { public Viewer createViewer(Composite composite) {
return new TableViewer(composite); return new TableViewer(composite);
} }
}; };
viewerPaneTable.createControl(comp); viewerPaneTable.createControl(comp);
tableViewer = (TableViewer)viewerPaneTable.getViewer(); tableViewer = (TableViewer)viewerPaneTable.getViewer();
viewerPaneTable.setTitle(Messages.getString("ServiceDiscoveryWizardDisplayPage.PropertiesTableTitle"), null); //$NON-NLS-1$ viewerPaneTable.setTitle(Messages.getString("ServiceDiscoveryWizardDisplayPage.PropertiesTableTitle"), null); //$NON-NLS-1$
table = tableViewer.getTable(); table = tableViewer.getTable();
TableLayout layout = new TableLayout(); TableLayout layout = new TableLayout();
table.setLayout(layout); table.setLayout(layout);
table.setHeaderVisible(true); table.setHeaderVisible(true);
table.setLinesVisible(true); table.setLinesVisible(true);
TableColumn objectColumn = new TableColumn(table, SWT.NONE); TableColumn objectColumn = new TableColumn(table, SWT.NONE);
layout.addColumnData(new ColumnWeightData(3, 100, true)); layout.addColumnData(new ColumnWeightData(3, 100, true));
objectColumn.setText(Messages.getString("ServiceDiscoveryWizardDisplayPage.KeyColumnLabel")); //$NON-NLS-1$ objectColumn.setText(Messages.getString("ServiceDiscoveryWizardDisplayPage.KeyColumnLabel")); //$NON-NLS-1$
objectColumn.setResizable(true); objectColumn.setResizable(true);
TableColumn selfColumn = new TableColumn(table, SWT.NONE); TableColumn selfColumn = new TableColumn(table, SWT.NONE);
layout.addColumnData(new ColumnWeightData(2, 100, true)); layout.addColumnData(new ColumnWeightData(2, 100, true));
selfColumn.setText(Messages.getString("ServiceDiscoveryWizardDisplayPage.ValueColumnLabel")); //$NON-NLS-1$ selfColumn.setText(Messages.getString("ServiceDiscoveryWizardDisplayPage.ValueColumnLabel")); //$NON-NLS-1$
selfColumn.setResizable(true); selfColumn.setResizable(true);
tableViewer.setContentProvider(new AdapterFactoryContentProvider(adapterFactory)); tableViewer.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));
tableViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory)); tableViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));
editor = new TableEditor(table); editor = new TableEditor(table);
editor.horizontalAlignment = SWT.LEFT; editor.horizontalAlignment = SWT.LEFT;
editor.grabHorizontal = true; editor.grabHorizontal = true;
table.addListener (SWT.MouseDown, new Listener () { table.addListener (SWT.MouseDown, new Listener () {
public void handleEvent (Event event) { public void handleEvent (Event event) {
Rectangle clientArea = table.getClientArea (); Rectangle clientArea = table.getClientArea ();
Point pt = new Point (event.x, event.y); Point pt = new Point (event.x, event.y);
int index = table.getTopIndex (); int index = table.getTopIndex ();
while (index < table.getItemCount ()) { while (index < table.getItemCount ()) {
boolean visible = false; boolean visible = false;
final TableItem item = table.getItem (index); final TableItem item = table.getItem (index);
for (int i=table.getColumnCount()-1; i<table.getColumnCount(); i++) { for (int i=table.getColumnCount()-1; i<table.getColumnCount(); i++) {
Rectangle rect = item.getBounds (i); Rectangle rect = item.getBounds (i);
if (rect.contains (pt)) { if (rect.contains (pt)) {
final int column = i; final int column = i;
final Text text = new Text (table, SWT.NONE); final Text text = new Text (table, SWT.NONE);
Listener textListener = new Listener () { Listener textListener = new Listener () {
public void handleEvent (final Event e) { public void handleEvent (final Event e) {
switch (e.type) { switch (e.type) {
case SWT.FocusOut: case SWT.FocusOut:
item.setText (column, text.getText ()); item.setText (column, text.getText ());
text.dispose (); text.dispose ();
//update model when focus out //update model when focus out
updatePairs(item.getText(0),item.getText(1)); updatePairs(item.getText(0),item.getText(1));
break; break;
case SWT.Traverse: case SWT.Traverse:
switch (e.detail) { switch (e.detail) {
case SWT.TRAVERSE_RETURN: case SWT.TRAVERSE_RETURN:
item.setText (column, text.getText ()); item.setText (column, text.getText ());
//update model when pressing return //update model when pressing return
updatePairs(item.getText(0),item.getText(1)); updatePairs(item.getText(0),item.getText(1));
text.dispose (); text.dispose ();
e.doit = false; e.doit = false;
break; break;
case SWT.TRAVERSE_ESCAPE: case SWT.TRAVERSE_ESCAPE:
text.dispose (); text.dispose ();
e.doit = false; e.doit = false;
}
break;
}
} }
}; break;
text.addListener (SWT.FocusOut, textListener); }
text.addListener (SWT.Traverse, textListener);
editor.setEditor (text, item, i);
text.setText (item.getText (i));
text.selectAll ();
text.setFocus ();
return;
} }
if (!visible && rect.intersects (clientArea)) { };
visible = true; text.addListener (SWT.FocusOut, textListener);
} text.addListener (SWT.Traverse, textListener);
} editor.setEditor (text, item, i);
if (!visible) return; text.setText (item.getText (i));
index++; text.selectAll ();
text.setFocus ();
return;
}
if (!visible && rect.intersects (clientArea)) {
visible = true;
} }
} }
}); if (!visible) return;
index++;
}
}
});
} }
@ -567,15 +558,15 @@ public class ServiceDiscoveryWizardDisplayPage extends WizardPage {
public void widgetSelected(SelectionEvent e) { public void widgetSelected(SelectionEvent e) {
Object src = e.getSource(); Object src = e.getSource();
if(((Button)src).getSelection()) if(((Button)src).getSelection())
{ {
((ContainerCheckedTreeViewer) viewerPaneTree.getViewer()).removeFilter(filter); ((ContainerCheckedTreeViewer) viewerPaneTree.getViewer()).removeFilter(filter);
} }
else else
{ {
((ContainerCheckedTreeViewer) viewerPaneTree.getViewer()).addFilter(filter); ((ContainerCheckedTreeViewer) viewerPaneTree.getViewer()).addFilter(filter);
} }
} }
}); });
} }
@ -597,12 +588,11 @@ public class ServiceDiscoveryWizardDisplayPage extends WizardPage {
} }
/** /**
* Get the <code>Service<code> objects selected in the tree view from the specified host * Get the
* <code>Service<code> objects selected in the tree view from the specified host
* *
* @param address * @param address Address of the host which services are queried
* Address of the host which services are queried * @return Vector containing the <code>Service<code> selected
* @return
* Vector containing the <code>Service<code> selected
* *
* @see Service * @see Service
*/ */
@ -651,11 +641,11 @@ public class ServiceDiscoveryWizardDisplayPage extends WizardPage {
return addresses; return addresses;
} }
/* (non-Javadoc) /* (non-Javadoc)
* @see org.eclipse.jface.wizard.WizardPage#canFlipToNextPage() * @see org.eclipse.jface.wizard.WizardPage#canFlipToNextPage()
*/ */
public boolean canFlipToNextPage() { public boolean canFlipToNextPage() {
return false; return false;
} }
} }