diff --git a/discovery/org.eclipse.rse.discovery/src/org/eclipse/rse/discovery/ServiceDiscoveryWizard.java b/discovery/org.eclipse.rse.discovery/src/org/eclipse/rse/discovery/ServiceDiscoveryWizard.java index 0db6121eaea..7b44a5abcdc 100644 --- a/discovery/org.eclipse.rse.discovery/src/org/eclipse/rse/discovery/ServiceDiscoveryWizard.java +++ b/discovery/org.eclipse.rse.discovery/src/org/eclipse/rse/discovery/ServiceDiscoveryWizard.java @@ -14,10 +14,6 @@ import java.util.Enumeration; import java.util.Iterator; import java.util.Vector; -import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.core.runtime.IStatus; -import org.eclipse.core.runtime.Status; -import org.eclipse.core.runtime.jobs.Job; import org.eclipse.jface.wizard.IWizardPage; import org.eclipse.jface.wizard.Wizard; import org.eclipse.rse.core.model.IHost; @@ -128,9 +124,7 @@ public class ServiceDiscoveryWizard extends Wizard { RSEUIPlugin.getDefault().getSystemRegistry().expandHost(conn); } } catch (Exception e) { - if (conn != null) { RSEUIPlugin.getDefault().getSystemRegistry().deleteHost(conn); - } } finally { systemRefreshAllAction.run(); } diff --git a/discovery/org.eclipse.tm.discovery.engine/src/org/eclipse/tm/discovery/protocol/ProtocolFactory.java b/discovery/org.eclipse.tm.discovery.engine/src/org/eclipse/tm/discovery/protocol/ProtocolFactory.java index e08c8956f9c..87c103a6556 100644 --- a/discovery/org.eclipse.tm.discovery.engine/src/org/eclipse/tm/discovery/protocol/ProtocolFactory.java +++ b/discovery/org.eclipse.tm.discovery.engine/src/org/eclipse/tm/discovery/protocol/ProtocolFactory.java @@ -5,7 +5,7 @@ * available at http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Javier Montalvo Orús (Symbian) - initial API and implementation + * Javier Montalvo Orus (Symbian) - initial API and implementation ********************************************************************************/ package org.eclipse.tm.discovery.protocol; @@ -64,6 +64,7 @@ public class ProtocolFactory { public static String[] getQueryList(String protocolName) throws CoreException { IProtocol protocol = null; + String[] queries = null; IConfigurationElement[] ce = ep.getConfigurationElements(); for (int i = 0; i < ce.length; i++) { @@ -75,11 +76,12 @@ public class ProtocolFactory { } } - String[] queries = protocol.getQueries(); - - if(queries==null) - queries = new String[]{}; - + if(protocol != null) + { + queries = protocol.getQueries(); + if(queries==null) + queries = new String[]{}; + } return queries; } diff --git a/discovery/org.eclipse.tm.discovery.model.edit/src/org/eclipse/tm/discovery/model/provider/DeviceItemProvider.java b/discovery/org.eclipse.tm.discovery.model.edit/src/org/eclipse/tm/discovery/model/provider/DeviceItemProvider.java index 10c52195639..bfd2f6a9694 100644 --- a/discovery/org.eclipse.tm.discovery.model.edit/src/org/eclipse/tm/discovery/model/provider/DeviceItemProvider.java +++ b/discovery/org.eclipse.tm.discovery.model.edit/src/org/eclipse/tm/discovery/model/provider/DeviceItemProvider.java @@ -48,6 +48,7 @@ public class DeviceItemProvider IItemPropertySource { /** * This constructs an instance from a factory and a notifier. + * @param adapterFactory * * @generated */ diff --git a/discovery/org.eclipse.tm.discovery.model.edit/src/org/eclipse/tm/discovery/model/provider/NetworkItemProvider.java b/discovery/org.eclipse.tm.discovery.model.edit/src/org/eclipse/tm/discovery/model/provider/NetworkItemProvider.java index 80233a931a9..c41a309bd69 100644 --- a/discovery/org.eclipse.tm.discovery.model.edit/src/org/eclipse/tm/discovery/model/provider/NetworkItemProvider.java +++ b/discovery/org.eclipse.tm.discovery.model.edit/src/org/eclipse/tm/discovery/model/provider/NetworkItemProvider.java @@ -46,6 +46,7 @@ public class NetworkItemProvider IItemPropertySource { /** * This constructs an instance from a factory and a notifier. + * @param adapterFactory * * @generated */ diff --git a/discovery/org.eclipse.tm.discovery.model.edit/src/org/eclipse/tm/discovery/model/provider/PairItemProvider.java b/discovery/org.eclipse.tm.discovery.model.edit/src/org/eclipse/tm/discovery/model/provider/PairItemProvider.java index 6bab3929dba..94f55ac8446 100644 --- a/discovery/org.eclipse.tm.discovery.model.edit/src/org/eclipse/tm/discovery/model/provider/PairItemProvider.java +++ b/discovery/org.eclipse.tm.discovery.model.edit/src/org/eclipse/tm/discovery/model/provider/PairItemProvider.java @@ -47,6 +47,7 @@ public class PairItemProvider { /** * This constructs an instance from a factory and a notifier. + * @param adapterFactory * * @generated */ diff --git a/discovery/org.eclipse.tm.discovery.model.edit/src/org/eclipse/tm/discovery/model/provider/ServiceItemProvider.java b/discovery/org.eclipse.tm.discovery.model.edit/src/org/eclipse/tm/discovery/model/provider/ServiceItemProvider.java index 81b70a5e94f..20e8c14742f 100644 --- a/discovery/org.eclipse.tm.discovery.model.edit/src/org/eclipse/tm/discovery/model/provider/ServiceItemProvider.java +++ b/discovery/org.eclipse.tm.discovery.model.edit/src/org/eclipse/tm/discovery/model/provider/ServiceItemProvider.java @@ -45,6 +45,7 @@ public class ServiceItemProvider IItemPropertySource{ /** * This constructs an instance from a factory and a notifier. + * @param adapterFactory * * @generated */ diff --git a/discovery/org.eclipse.tm.discovery.model.edit/src/org/eclipse/tm/discovery/model/provider/ServiceTypeItemProvider.java b/discovery/org.eclipse.tm.discovery.model.edit/src/org/eclipse/tm/discovery/model/provider/ServiceTypeItemProvider.java index c1723a4ed25..15a755e3787 100644 --- a/discovery/org.eclipse.tm.discovery.model.edit/src/org/eclipse/tm/discovery/model/provider/ServiceTypeItemProvider.java +++ b/discovery/org.eclipse.tm.discovery.model.edit/src/org/eclipse/tm/discovery/model/provider/ServiceTypeItemProvider.java @@ -46,6 +46,7 @@ public class ServiceTypeItemProvider { /** * This constructs an instance from a factory and a notifier. + * @param adapterFactory * * @generated */ diff --git a/discovery/org.eclipse.tm.discovery.model/plugin.xml b/discovery/org.eclipse.tm.discovery.model/plugin.xml index f24284752e2..cc4fa461a62 100644 --- a/discovery/org.eclipse.tm.discovery.model/plugin.xml +++ b/discovery/org.eclipse.tm.discovery.model/plugin.xml @@ -15,13 +15,13 @@ Contributors: + class = "org.eclipse.tm.discovery.model.ModelPackage" /> + class="org.eclipse.tm.discovery.model.util.ModelResourceFactoryImpl" /> diff --git a/discovery/org.eclipse.tm.discovery.model/src/org/eclipse/tm/discovery/model/ModelPackage.java b/discovery/org.eclipse.tm.discovery.model/src/org/eclipse/tm/discovery/model/ModelPackage.java index 1d7cb84ffcd..91d2f36be5f 100644 --- a/discovery/org.eclipse.tm.discovery.model/src/org/eclipse/tm/discovery/model/ModelPackage.java +++ b/discovery/org.eclipse.tm.discovery.model/src/org/eclipse/tm/discovery/model/ModelPackage.java @@ -389,6 +389,10 @@ public interface ModelPackage extends EPackage { * * @generated */ + + + + interface Literals { /** * The meta object literal for the '{@link org.eclipse.tm.discovery.model.impl.DeviceImpl Device}' class. @@ -397,6 +401,7 @@ public interface ModelPackage extends EPackage { * @see org.eclipse.tm.discovery.model.impl.ModelPackageImpl#getDevice() * @generated */ + EClass DEVICE = eINSTANCE.getDevice(); /** diff --git a/discovery/org.eclipse.tm.discovery.model/src/org/eclipse/tm/discovery/model/impl/ModelFactoryImpl.java b/discovery/org.eclipse.tm.discovery.model/src/org/eclipse/tm/discovery/model/impl/ModelFactoryImpl.java index 0fd2fe4bbeb..ce3ab62161d 100644 --- a/discovery/org.eclipse.tm.discovery.model/src/org/eclipse/tm/discovery/model/impl/ModelFactoryImpl.java +++ b/discovery/org.eclipse.tm.discovery.model/src/org/eclipse/tm/discovery/model/impl/ModelFactoryImpl.java @@ -29,6 +29,7 @@ import org.eclipse.tm.discovery.model.*; public class ModelFactoryImpl extends EFactoryImpl implements ModelFactory { /** * Creates the default factory implementation. + * @return model factory * * @generated */ @@ -125,6 +126,7 @@ public class ModelFactoryImpl extends EFactoryImpl implements ModelFactory { /** * + * @return model package * @deprecated * @generated */ diff --git a/discovery/org.eclipse.tm.discovery.model/src/org/eclipse/tm/discovery/model/impl/ModelPackageImpl.java b/discovery/org.eclipse.tm.discovery.model/src/org/eclipse/tm/discovery/model/impl/ModelPackageImpl.java index f5b7d955466..0e75e8b3078 100644 --- a/discovery/org.eclipse.tm.discovery.model/src/org/eclipse/tm/discovery/model/impl/ModelPackageImpl.java +++ b/discovery/org.eclipse.tm.discovery.model/src/org/eclipse/tm/discovery/model/impl/ModelPackageImpl.java @@ -5,7 +5,7 @@ * available at http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Javier Montalvo Orús (Symbian) - initial API and implementation + * Javier Montalvo Orus (Symbian) - initial API and implementation ********************************************************************************/ package org.eclipse.tm.discovery.model.impl; @@ -103,6 +103,7 @@ public class ModelPackageImpl extends EPackageImpl implements ModelPackage { * those of another. *

Invocation of this method will not affect any packages that have * already been initialized. + * @return the model package * * @see #eNS_URI * @see #createPackageContents() diff --git a/discovery/org.eclipse.tm.discovery.model/src/org/eclipse/tm/discovery/model/util/ModelSwitch.java b/discovery/org.eclipse.tm.discovery.model/src/org/eclipse/tm/discovery/model/util/ModelSwitch.java index d7d005a293a..d94aff2091c 100644 --- a/discovery/org.eclipse.tm.discovery.model/src/org/eclipse/tm/discovery/model/util/ModelSwitch.java +++ b/discovery/org.eclipse.tm.discovery.model/src/org/eclipse/tm/discovery/model/util/ModelSwitch.java @@ -5,7 +5,7 @@ * available at http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Javier Montalvo Orús (Symbian) - initial API and implementation + * Javier Montalvo Orus (Symbian) - initial API and implementation ********************************************************************************/ package org.eclipse.tm.discovery.model.util; @@ -51,6 +51,7 @@ public class ModelSwitch { /** * Calls caseXXX for each class of the model until one returns a non null result; it yields that result. + * @param theEObject * * @return the first non-null result returned by a caseXXX call. * @generated diff --git a/discovery/org.eclipse.tm.discovery.protocol.dnssd/src/org/eclipse/tm/discovery/protocol/dnssd/DNSSDProtocol.java b/discovery/org.eclipse.tm.discovery.protocol.dnssd/src/org/eclipse/tm/discovery/protocol/dnssd/DNSSDProtocol.java index f637c4cf3af..13bab04ba48 100644 --- a/discovery/org.eclipse.tm.discovery.protocol.dnssd/src/org/eclipse/tm/discovery/protocol/dnssd/DNSSDProtocol.java +++ b/discovery/org.eclipse.tm.discovery.protocol.dnssd/src/org/eclipse/tm/discovery/protocol/dnssd/DNSSDProtocol.java @@ -5,7 +5,7 @@ * available at http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Javier Montalvo Orús (Symbian) - initial API and implementation + * Javier Montalvo Orus (Symbian) - initial API and implementation ********************************************************************************/ package org.eclipse.tm.discovery.protocol.dnssd; @@ -369,8 +369,8 @@ public class DNSSDProtocol implements IProtocol { private void handlePTRRecord(ByteArrayInputStream packetInputStream, Device device, String name) { - Service service = null; - ServiceType serviceType = null; + Service service = ModelFactory.eINSTANCE.createService(); + ServiceType serviceType = ModelFactory.eINSTANCE.createServiceType(); //skip dataLength packetInputStream.skip(2); @@ -442,8 +442,8 @@ public class DNSSDProtocol implements IProtocol { private void handleSRVRecord(ByteArrayInputStream packetInputStream, Device device, String name) { - Service service = null; - ServiceType serviceType = null; + Service service = ModelFactory.eINSTANCE.createService(); + ServiceType serviceType = ModelFactory.eINSTANCE.createServiceType(); //data of the packet, without bytes for priority-weight-port int dataLength = (packetInputStream.read() << 8 | packetInputStream.read()) - 6; @@ -541,8 +541,8 @@ public class DNSSDProtocol implements IProtocol { } private void handleTXTRecord(ByteArrayInputStream packetInputStream, Device device, String recordName) { - ServiceType serviceType = null; - Service service = null;; + ServiceType serviceType = ModelFactory.eINSTANCE.createServiceType(); + Service service = ModelFactory.eINSTANCE.createService(); int dataLength = packetInputStream.read() << 8 | packetInputStream.read(); byte [] data = new byte[dataLength]; diff --git a/discovery/org.eclipse.tm.discovery.wizard/src/org/eclipse/tm/discovery/wizard/ServiceDiscoveryWizardDisplayPage.java b/discovery/org.eclipse.tm.discovery.wizard/src/org/eclipse/tm/discovery/wizard/ServiceDiscoveryWizardDisplayPage.java index 7b672262e17..c41b2522fbb 100644 --- a/discovery/org.eclipse.tm.discovery.wizard/src/org/eclipse/tm/discovery/wizard/ServiceDiscoveryWizardDisplayPage.java +++ b/discovery/org.eclipse.tm.discovery.wizard/src/org/eclipse/tm/discovery/wizard/ServiceDiscoveryWizardDisplayPage.java @@ -451,7 +451,9 @@ public class ServiceDiscoveryWizardDisplayPage extends WizardPage { //update model when pressing return updatePairs(item.getText(0),item.getText(1)); - + text.dispose (); + e.doit = false; + break; case SWT.TRAVERSE_ESCAPE: text.dispose (); e.doit = false;