fix(TUP-38042):fix a context display problem on Mac. (#6397)

* fix(TUP-38042):fix a display problem on Mac.

* fix(TUP-38042):update a message

main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/model/process/ProcessUtils.java

@@ -768,39 +768,6 @@ public final class ProcessUtils {
         return false;
 
     }
-    
-    public static boolean isRouteWithRoutelets(Item item) {
-        if (item!= null && item instanceof ProcessItem) {
-            for (Object obj : ((ProcessItem) item).getProcess().getNode()) {
-                if (obj instanceof NodeType) {
-                    if (isRouteletNode((NodeType) obj)) {
-                        return true;
-                    }
-                }
-            }
-        }
-        return false;
-    }
-    
-    public static boolean isRouteletNode(NodeType node) {
-        String jobIds = getParameterValue(node.getElementParameter(), "PROCESS_TYPE:PROCESS_TYPE_PROCESS");
-        String jobVersion = getParameterValue(node.getElementParameter(), "PROCESS_TYPE:PROCESS_TYPE_VERSION"); //$NON-NLS-1$
-        ProcessItem processItem = ItemCacheManager.getProcessItem(jobIds, jobVersion);
-        if (processItem != null) {
-            return ERepositoryObjectType.getType(processItem.getProperty()).equals(
-                    ERepositoryObjectType.PROCESS_ROUTELET);
-        }
-        return false;
-    }
-    
-    public static String getParameterValue(EList<ElementParameterType> listParamType, String paramName) {
-        for (ElementParameterType pType : listParamType) {
-            if (pType != null && paramName.equals(pType.getName())) {
-                return pType.getValue();
-            }
-        }
-        return null;
-    }
 
     public static int getAssertAmount(IProcess process) {
         int count = 0;
@@ -1091,28 +1058,6 @@ public final class ProcessUtils {
         }
         return false;
     }
-    
-    public static boolean isChildRouteProcess(Item item) {
-    	
-        if (item!= null && item instanceof ProcessItem) {
-            for (Object obj : ((ProcessItem) item).getProcess().getNode()) {
-                if (obj instanceof NodeType) {
-                    if (((NodeType) obj).getComponentName().equals("tRouteInput")) {
-                        return true;
-                    }
-                }
-            }
-        }
-        return false;
-
-    }
-    
-    public static boolean isRoutelet(Property p) {
-        if (p != null) {
-            return ERepositoryObjectType.getType(p).equals(ERepositoryObjectType.PROCESS_ROUTELET);
-        }
-        return false;
-    }
 
     public static String escapeJava(String input) {
         return StringEscapeUtils.escapeJava(input);

main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/runtime/process/JobInfoProperties.java

@@ -42,8 +42,6 @@ public class JobInfoProperties extends Properties {
     public static final String PROJECT_NAME = "project"; //$NON-NLS-1$
 
     public static final String JOB_ID = "jobId"; //$NON-NLS-1$
-    
-    public static final String JOB_PARENT_ID = "jobParentId"; //$NON-NLS-1$
 
     public static final String JOB_NAME = "job"; //$NON-NLS-1$
 
@@ -100,10 +98,6 @@ public class JobInfoProperties extends Properties {
             setProperty(BRANCH, branchSelection);
         }
 
-        if (processItem.getProperty() != null && processItem.getProperty().getParentItem() != null) {
-            setProperty(JOB_PARENT_ID, processItem.getProperty().getParentItem().getProperty().getId());
-        }
-        
         setProperty(JOB_ID, jobInfo.getJobId());
         setProperty(JOB_NAME, jobInfo.getJobName());
         String jobType = processItem.getProcess().getJobType();

main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/runtime/repository/build/IBuildParametes.java

@@ -22,8 +22,6 @@ public interface IBuildParametes {
     static final String SERVICE = "Service"; //$NON-NLS-1$
 
     static final String ITEM = "Item"; //$NON-NLS-1$
-    
-    static final String PARENT_ITEM = "ParentItem"; //$NON-NLS-1$
 
     static final String VERSION = "Version"; //$NON-NLS-1$
 

main/plugins/org.talend.core.ui/src/main/java/messages.properties

@@ -267,7 +267,7 @@ SelectRepositoryContextDialog.ExpandAll=Expand All
 SelectRepositoryContextDialog.Title=Select Context Variables
 SelectRepositoryContextDialog.View=View...
 SelectRepositoryContextGroupDialog.Default=default
-SelectRepositoryContextGroupDialog.Messages=In the Job, add a nonexistent context group from the repository context
+SelectRepositoryContextGroupDialog.defaultMessages=In the Job, add a nonexistent context from the repository context
 SelectRepositoryContextGroupDialog.addTitle=Add Context
 TalendTabbedPropertyComposite.compactButton.toolTip=compact view
 TalendTabbedPropertyComposite.tableButton.toolTip=table view

main/plugins/org.talend.core.ui/src/main/java/org/talend/core/ui/context/ContextNebulaGridComposite.java

@@ -178,9 +178,17 @@ public class ContextNebulaGridComposite extends AbstractContextTabEditComposite
             if (!ContextNatTableUtils.checkIsInstallExternalJar()) {
                 createMessageGroup(this);
             } else {
-                createButtonsGroup(this);
+                boolean isRepositoryContext = (modelManager instanceof ContextComposite)
+                        && ((ContextComposite) modelManager).isRepositoryContext();
+                if (isRepositoryContext) {
+                    createNatTableGroup(this);
 
-                createNatTableGroup(this);
+                    createButtonsGroup(this);
+                } else {
+                    createButtonsGroup(this);
+
+                    createNatTableGroup(this);
+                }
 
                 createNatTable();
 

main/plugins/org.talend.core.ui/src/main/java/org/talend/core/ui/context/SelectRepositoryContextGroupDialog.java

@@ -52,7 +52,7 @@ import org.talend.designer.core.model.utils.emf.talendfile.ContextType;
  */
 public class SelectRepositoryContextGroupDialog extends SelectionDialog {
 
-    private static final String DEFAULTMESAGE = Messages.getString("SelectRepositoryContextGroupDialog.Messages"); //$NON-NLS-1$
+    private static final String DEFAULTMESAGE = Messages.getString("SelectRepositoryContextGroupDialog.defaultMessages"); //$NON-NLS-1$
 
     private static final String TITILE = Messages.getString("SelectRepositoryContextGroupDialog.addTitle"); //$NON-NLS-1$
 

main/plugins/org.talend.core/src/main/java/org/talend/designer/runprocess/ProcessorUtilities.java

@@ -1632,10 +1632,6 @@ public class ProcessorUtilities {
                                         subJobInfo.setContextName(defaultContext);
                                     }
                                 }
-                                
-                                if (CommonsPlugin.isHeadless() && interpreter != null) {
-                                	processItem.getProperty().setParentItem(ItemCacheManager.getProcessItem(currentProcess.getId(), currentProcess.getVersion()));
-                                }
 
                                 int subJobOption = GENERATE_ALL_CHILDS;
                                 if (BitwiseOptionUtils.containOption(option, GENERATE_WITH_FIRST_CHILD)) {
@@ -2557,7 +2553,7 @@ public class ProcessorUtilities {
         return jobInfos;
     }
 
-    public static boolean isRouteletNode(NodeType node) {
+    private static boolean isRouteletNode(NodeType node) {
         String jobIds = getParameterValue(node.getElementParameter(), "PROCESS_TYPE:PROCESS_TYPE_PROCESS");
         String jobVersion = getParameterValue(node.getElementParameter(), "PROCESS_TYPE:PROCESS_TYPE_VERSION"); //$NON-NLS-1$
         ProcessItem processItem = ItemCacheManager.getProcessItem(jobIds, jobVersion);

main/plugins/org.talend.designer.maven/src/main/java/org/talend/designer/maven/template/ETalendMavenVariables.java

@@ -45,7 +45,6 @@ public enum ETalendMavenVariables {
     JobletName,
 
     JobId,
-    JobParentId,
     JobName,
     JobType,
     JobFinalName,

main/plugins/org.talend.designer.maven/src/main/java/org/talend/designer/maven/tools/AggregatorPomsHelper.java

@@ -29,6 +29,7 @@ import java.util.Map;
 import java.util.Set;
 import java.util.function.Function;
 import java.util.stream.Collectors;
+
 import org.apache.commons.lang3.StringUtils;
 import org.apache.maven.model.Activation;
 import org.apache.maven.model.Model;
@@ -54,7 +55,6 @@ import org.slf4j.LoggerFactory;
 import org.talend.commons.exception.ExceptionHandler;
 import org.talend.commons.exception.PersistenceException;
 import org.talend.commons.utils.MojoType;
-import org.talend.commons.utils.VersionUtils;
 import org.talend.commons.utils.workbench.resources.ResourceUtils;
 import org.talend.core.GlobalServiceRegister;
 import org.talend.core.IESBService;
@@ -110,7 +110,7 @@ public class AggregatorPomsHelper {
     private static final Logger LOGGER = LoggerFactory.getLogger(AggregatorPomsHelper.class);
 
     private String projectTechName;
-    
+
     public AggregatorPomsHelper() {
         projectTechName = ProjectManager.getInstance().getCurrentProject().getTechnicalLabel();
     }
@@ -389,37 +389,9 @@ public class AggregatorPomsHelper {
     public String getJobProjectName(Property property) {
         return projectTechName + "_" + getJobProjectFolderName(property).toUpperCase(); //$NON-NLS-1$
     }
-    
-    public static String getJobLabel(Property property) {
-
-    	if (property == null) {
-    		return "";
-    	}
-    	
-    	if (property.getParentItem() != null) {
-    		Property parentProperty = property.getParentItem().getProperty();
-    		return parentProperty.getLabel() + "_" + parentProperty.getVersion().replace(".", "_") + "_" + property.getLabel();
-    	}
-    	
-    	return property.getLabel();
-    }
-    
-    public static String getJobId(Property property) {
-
-    	if (property == null) {
-    		return "";
-    	}
-    	
-    	if (property.getParentItem() != null) {
-    		Property parentProperty = property.getParentItem().getProperty();
-    		return property.getId() + "_" + parentProperty.getId() + "_" + parentProperty.getVersion().replace(".", "_");
-    	}
-    	
-    	return property.getId();
-    }
 
     public static String getJobProjectFolderName(Property property) {
-        return getJobProjectFolderName(getJobLabel(property), property.getVersion());
+        return getJobProjectFolderName(property.getLabel(), property.getVersion());
     }
 
     public static String getJobProjectFolderName(String label, String version) {
@@ -428,7 +400,7 @@ public class AggregatorPomsHelper {
 
     public static String getJobProjectId(Property property) {
         String _projectTechName = ProjectManager.getInstance().getProject(property).getTechnicalLabel();
-        return getJobProjectId(_projectTechName, getJobId(property), property.getVersion());
+        return getJobProjectId(_projectTechName, property.getId(), property.getVersion());
     }
 
     public static String getJobProjectId(String projectTechName, String id, String version) {
@@ -469,7 +441,7 @@ public class AggregatorPomsHelper {
         AggregatorPomsHelper helper = new AggregatorPomsHelper(projectTechName);
         IPath itemRelativePath = getItemRelativePath.apply(property);
         String version = realVersion == null ? property.getVersion() : realVersion;
-        String jobFolderName = getJobProjectFolderName(getJobLabel(property), version);
+        String jobFolderName = getJobProjectFolderName(property.getLabel(), version);
         ERepositoryObjectType type = ERepositoryObjectType.getItemType(property.getItem());
         IFolder jobFolder = null;
         if (PomIdsHelper.skipFolders()) {
@@ -654,8 +626,7 @@ public class AggregatorPomsHelper {
         syncAllPomsWithoutProgress(monitor, PomIdsHelper.getPomFilter(), false);
     }
 
-    @SuppressWarnings("unchecked")
-	public void syncAllPomsWithoutProgress(IProgressMonitor monitor, String pomFilter, boolean withDependencies)
+    public void syncAllPomsWithoutProgress(IProgressMonitor monitor, String pomFilter, boolean withDependencies)
             throws Exception {
         LOGGER.info("syncAllPomsWithoutProgress, pomFilter: " + pomFilter);
         IRunProcessService runProcessService = IRunProcessService.get();
@@ -745,110 +716,19 @@ public class AggregatorPomsHelper {
         List<Property> serviceRefJobs = getAllServiceReferencedJobs();
         for (Item item : allItems) {
             if (ProjectManager.getInstance().isInCurrentMainProject(item)) {
-            	
-	            // remove original child jobs/routelets projects as they will be created during parent Route generation 
-	            if (ProcessUtils.isRoutelet(item.getProperty()) || ProcessUtils.isChildRouteProcess(item)) {
-	            	continue;
-	            }
-	
                 monitor.subTask("Synchronize job pom: " + item.getProperty().getLabel() //$NON-NLS-1$
                         + "_" + item.getProperty().getVersion()); //$NON-NLS-1$
                 runProcessService.generatePom(item, TalendProcessOptionConstants.GENERATE_POM_NO_FILTER);
-                
                 IFile pomFile = getItemPomFolder(item.getProperty()).getFile(TalendMavenConstants.POM_FILE_NAME);
                 // filter esb data service node
                 // FIXME use serviceRefJobs.contains(item.getProperty()) if isSOAPServiceProvider() doesn't work.
                 if (isCIMode && !isSOAPServiceProvider(item.getProperty()) && pomFile.exists()) {
                     modules.add(getModulePath(pomFile));
                 }
-	            monitor.worked(1);
-	            if (monitor.isCanceled()) {
-	                return;
-	            }
-	            
-
-	            
-	            // Generate individual child job projects/poms for each Route (CI mode only)
-	            
-                if (isCIMode && (ProcessUtils.isRouteWithChildJobs(item) ||   ProcessUtils.isRouteWithRoutelets(item))) {
-                
-                    Set<JobInfo> allJobInfos = ProcessorUtilities.getChildrenJobInfo(item, true, true);
-                	
-	                for (JobInfo childJob : allJobInfos) {
-	                	
-	                	if (childJob.getProcessItem() != null && childJob.getProcessItem().getProperty() != null ) {
-	                		
-	                		Property childJobProperty = childJob.getProcessItem().getProperty();
-	                    	String jobGroupID = (String) childJob.getProcessItem().getProperty().getAdditionalProperties().get(MavenConstants.NAME_GROUP_ID);
-	                    	String jobCustomVersion = (String) childJob.getProcessItem().getProperty().getAdditionalProperties().get(MavenConstants.NAME_USER_VERSION);
-	                    	String jobBuildType = (String) childJob.getProcessItem().getProperty().getAdditionalProperties().get(TalendProcessArgumentConstant.ARG_BUILD_TYPE);
-	                    	boolean jobUseSnapshot = childJob.getProcessItem().getProperty().getAdditionalProperties().containsKey(MavenConstants.NAME_PUBLISH_AS_SNAPSHOT);
-	                    	
-	                		Property routeProperty = item.getProperty();
-	                    	String routeGroupID = PomIdsHelper.getJobGroupId(routeProperty);
-	                    	String routeVersion = VersionUtils.getPublishVersion(routeProperty.getVersion());
-	                    	String routeCustomVersion = (String) routeProperty.getAdditionalProperties().get(MavenConstants.NAME_USER_VERSION);
-	                    	boolean routeUseSnapshot = routeProperty.getAdditionalProperties().containsKey(MavenConstants.NAME_PUBLISH_AS_SNAPSHOT);
-	                    	String routeBuildType =  (String) routeProperty.getAdditionalProperties().get(TalendProcessArgumentConstant.ARG_BUILD_TYPE);
-	
-	                    	
-	                    	// Inherit child job parameters from parent route
-	                    	
-	                    	childJobProperty.setParentItem(item);
-	                    	childJobProperty.getAdditionalProperties().put(MavenConstants.NAME_GROUP_ID, routeGroupID);
-
-	                    	if (routeCustomVersion != null) {
-	                        	childJobProperty.getAdditionalProperties().put(MavenConstants.NAME_USER_VERSION, routeCustomVersion);
-	                    	} else {
-	                        	childJobProperty.getAdditionalProperties().put(MavenConstants.NAME_USER_VERSION, routeVersion);
-	                    	}
-	                    	
-	                    	if (routeUseSnapshot) {
-	                    		childJobProperty.getAdditionalProperties().put(MavenConstants.NAME_PUBLISH_AS_SNAPSHOT, "true");
-	                    	} else {
-	                    		childJobProperty.getAdditionalProperties().remove(MavenConstants.NAME_PUBLISH_AS_SNAPSHOT);
-	                    	}
-
-	                    	if ("ROUTE".equalsIgnoreCase(routeBuildType) || null == routeBuildType) {
-	                    		childJobProperty.getAdditionalProperties().put(TalendProcessArgumentConstant.ARG_BUILD_TYPE, "OSGI");
-	                    	} else {
-	                    		childJobProperty.getAdditionalProperties().put(TalendProcessArgumentConstant.ARG_BUILD_TYPE, "Standalone");
-	                    	}
-	                    	
-	                    	runProcessService.generatePom(childJob.getProcessItem(), TalendProcessOptionConstants.GENERATE_POM_NO_FILTER);
-	                    	
-	                    	IFile childPomFile = getItemPomFolder(childJobProperty).getFile(TalendMavenConstants.POM_FILE_NAME);
-	                        modules.add(getModulePath(childPomFile));
-	                        
-	                    	// restore original Job parameters
-	                    	childJobProperty.setParentItem(null);
-	                        
-	                        if ( jobGroupID!= null) {
-	                        	childJobProperty.getAdditionalProperties().put(MavenConstants.NAME_GROUP_ID, jobGroupID);
-	                        }else {
-	                        	childJobProperty.getAdditionalProperties().remove(MavenConstants.NAME_GROUP_ID);
-	                        }
-
-	                    	if (jobUseSnapshot) {
-	                    		childJobProperty.getAdditionalProperties().put(MavenConstants.NAME_PUBLISH_AS_SNAPSHOT, "true");
-	                    	}else {
-	                    		childJobProperty.getAdditionalProperties().remove(MavenConstants.NAME_PUBLISH_AS_SNAPSHOT);
-	                    	}
-	                    	
-	                    	if (jobCustomVersion!=null) {
-	                        	childJobProperty.getAdditionalProperties().put(MavenConstants.NAME_USER_VERSION, jobCustomVersion);
-	                    	} else {
-	                        	childJobProperty.getAdditionalProperties().remove(MavenConstants.NAME_USER_VERSION);
-	                    	}
-	                    	
-	                    	if (jobBuildType == null) {
-	                    		childJobProperty.getAdditionalProperties().remove(TalendProcessArgumentConstant.ARG_BUILD_TYPE);
-	                    	} else {
-	                    		childJobProperty.getAdditionalProperties().put(TalendProcessArgumentConstant.ARG_BUILD_TYPE, jobBuildType);
-	                    	}
-	                    }
-	                }
-	            }
+            }
+            monitor.worked(1);
+            if (monitor.isCanceled()) {
+                return;
             }
         }
         // sync project pom again with all modules.

main/plugins/org.talend.designer.maven/src/main/java/org/talend/designer/maven/tools/creator/AbstractMavenProcessorPom.java

@@ -149,33 +149,11 @@ public abstract class AbstractMavenProcessorPom extends CreateMavenBundleTemplat
             variablesValuesMap.put(ETalendMavenVariables.JobGroupId, PomIdsHelper.getJobGroupId(property));
             variablesValuesMap.put(ETalendMavenVariables.JobVersion, PomIdsHelper.getJobVersion(property));	    	
         }
-        
- 
+        variablesValuesMap.put(ETalendMavenVariables.JobArtifactId, PomIdsHelper.getJobArtifactId(property));	 
         variablesValuesMap.put(ETalendMavenVariables.TalendJobVersion, property.getVersion());
+        final String jobName = JavaResourcesHelper.escapeFileName(process.getName());
+        variablesValuesMap.put(ETalendMavenVariables.JobName, jobName);
 
-
-        if(ProcessUtils.isChildRouteProcess(process) || ProcessUtils.isRoutelet(property)) {
-        	if(property.getParentItem() != null) {
-            	String routeArtifactID = PomIdsHelper.getJobArtifactId(property.getParentItem().getProperty());
-            	String jobArtifactID =  PomIdsHelper.getJobArtifactId(property);
-            	String routeVersion = property.getParentItem().getProperty().getVersion().replace(".", "_");
-            	
-            	String jobName = (jobArtifactID.startsWith(routeArtifactID))? jobArtifactID : 
-            		routeArtifactID + "_" + routeVersion + "_" + jobArtifactID;
-        		
-        		variablesValuesMap.put(ETalendMavenVariables.JobArtifactId, jobName);
-        		variablesValuesMap.put(ETalendMavenVariables.JobName, jobName);
-        	} else {
-                variablesValuesMap.put(ETalendMavenVariables.JobArtifactId, PomIdsHelper.getJobArtifactId(property));	
-                final String jobName = JavaResourcesHelper.escapeFileName(process.getName());
-                variablesValuesMap.put(ETalendMavenVariables.JobName, jobName);
-        	}
-        } else  {
-            variablesValuesMap.put(ETalendMavenVariables.JobArtifactId, PomIdsHelper.getJobArtifactId(property));	
-            final String jobName = JavaResourcesHelper.escapeFileName(process.getName());
-            variablesValuesMap.put(ETalendMavenVariables.JobName, jobName);
-        }
-        
         if (property != null) {
             Project currentProject = ProjectManager.getInstance().getProject(property);
             variablesValuesMap.put(ETalendMavenVariables.ProjectName,

main/plugins/org.talend.designer.maven/src/main/java/org/talend/designer/maven/tools/creator/CreateMavenJobPom.java

@@ -282,9 +282,6 @@ public class CreateMavenJobPom extends AbstractMavenProcessorPom {
         String jobId = jobInfoProp.getProperty(JobInfoProperties.JOB_ID, process.getId());
         checkPomProperty(properties, "talend.job.id", ETalendMavenVariables.JobId,
                 jobId);
-        String jobParentId = jobInfoProp.getProperty(JobInfoProperties.JOB_PARENT_ID, "");
-        checkPomProperty(properties, "talend.job.parent.id", ETalendMavenVariables.JobParentId,
-                jobParentId);
         checkPomProperty(properties, "talend.job.type", ETalendMavenVariables.JobType,
                 jobInfoProp.getProperty(JobInfoProperties.JOB_TYPE));
 

main/plugins/org.talend.model/src/main/java/org/talend/core/model/properties/PropertiesPackage.java

@@ -399,37 +399,6 @@ public interface PropertiesPackage extends EPackage {
      * @generated
      */
     int ITEM = 6;
-    
-    
-    /**
-     * The meta object id for the parent '{@link org.talend.core.model.properties.impl.ItemImpl <em>Item</em>}' class. <!--
-     * begin-user-doc --> <!-- end-user-doc -->
-     * 
-     * @see org.talend.core.model.properties.impl.ItemImpl
-     * @see org.talend.core.model.properties.impl.PropertiesPackageImpl#getParentItem()
-     * @generated
-     */
-    int PARENT_ITEM = 109;
-    
-    
-    /**
-     * The meta object id for the '{@link org.talend.core.model.properties.impl.ItemImpl <em>Item</em>}' class. <!--
-     * begin-user-doc --> <!-- end-user-doc -->
-     * 
-     * @see org.talend.core.model.properties.impl.ItemImpl
-     * @see org.talend.core.model.properties.impl.PropertiesPackageImpl#getParentItem()
-     * @generated
-     */
-    int PARENT_ITEM__PROPERTY = 110;
-    
-    
-    /**
-     * The feature id for the parent '<em><b>Item</b></em>' reference.
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    int PROPERTY__PARENT_ITEM = 111;
 
     /**
 	 * The meta object id for the '{@link org.talend.core.model.properties.impl.BusinessProcessItemImpl <em>Business Process Item</em>}' class.

main/plugins/org.talend.model/src/main/java/org/talend/core/model/properties/Property.java

@@ -419,33 +419,5 @@ public interface Property extends EObject {
      * @generated
      */
     void setItem(Item value);
-    
-    /**
-     * Returns the value of the parent '<em><b>Item</b></em>' reference. It is bidirectional and its opposite is '
-     * {@link org.talend.core.model.properties.Item#getProperty <em>Property</em>}'. <!-- begin-user-doc -->
-     * <p>
-     * If the meaning of the parent '<em>Item</em>' reference isn't clear, there really should be more of a description here...
-     * </p>
-     * <!-- end-user-doc -->
-     * 
-     * @return the value of the parent'<em>Item</em>' reference.
-     * @see #setParentItem(Item)
-     * @see org.talend.core.model.properties.PropertiesPackage#getProperty_Item()
-     * @see org.talend.core.model.properties.Item#getProperty
-     * @model opposite="property"
-     * @generated
-     */
-    Item getParentItem();
-
-    /**
-     * Sets the value of the parent '{@link org.talend.core.model.properties.Property#getItem <em>Item</em>}' reference. <!--
-     * begin-user-doc --> <!-- end-user-doc -->
-     * 
-     * @param value the new value of the parent '<em>Item</em>' reference.
-     * @see #getParentItem()
-     * @generated
-     */
-    void setParentItem(Item value);
-
 
 } // Property

main/plugins/org.talend.model/src/main/java/org/talend/core/model/properties/impl/PropertyImpl.java

@@ -227,17 +227,6 @@ public class PropertyImpl extends EObjectImpl implements Property {
      * @ordered
      */
     protected Item item;
-    
-    
-    /**
-     * The cached value of the parent '{@link #getParentItem() <em>Item</em>}' reference.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see #getParentItem()
-     * @generated
-     * @ordered
-     */
-    protected Item parentItem;
 
     /**
      * The cached value of the '{@link #getAuthor() <em>Author</em>}' reference.
@@ -553,23 +542,6 @@ public class PropertyImpl extends EObjectImpl implements Property {
         }
         return item;
     }
-    
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public Item getParentItem() {
-        if (parentItem != null && parentItem.eIsProxy()) {
-            InternalEObject oldItem = (InternalEObject)parentItem;
-            parentItem = (Item)eResolveProxy(oldItem);
-            if (parentItem != oldItem) {
-                if (eNotificationRequired())
-                    eNotify(new ENotificationImpl(this, Notification.RESOLVE, PropertiesPackage.PROPERTY__PARENT_ITEM, oldItem, parentItem));
-            }
-        }
-        return parentItem;
-    }
 
     /**
      * <!-- begin-user-doc -->
@@ -579,15 +551,6 @@ public class PropertyImpl extends EObjectImpl implements Property {
     public Item basicGetItem() {
         return item;
     }
-    
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public Item basicGetParentItem() {
-        return parentItem;
-    }
 
     /**
      * <!-- begin-user-doc -->
@@ -622,13 +585,6 @@ public class PropertyImpl extends EObjectImpl implements Property {
         else if (eNotificationRequired())
             eNotify(new ENotificationImpl(this, Notification.SET, PropertiesPackage.PROPERTY__ITEM, newItem, newItem));
     }
-    
-    public void setParentItem(Item newItem) {
-    	Item oldItem = parentItem;
-    	parentItem = newItem;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, PropertiesPackage.PROPERTY__PARENT_ITEM, oldItem, newItem));
-    }
 
     /**
      * <!-- begin-user-doc -->