Simplify installer model

Inline some and remove other unused children. Flattening the model to
ease manipulation.

Author: akurtakov

openchrom/plugins/net.openchrom.installer.ui/plugin.xml

@@ -20,30 +20,23 @@
 import org.eclipse.swt.widgets.Event;
 import org.eclipse.swt.widgets.Label;
 
-import net.openchrom.installer.model.Overview;
-
-/**
- * @author David Green
- * @author Igor Burilo
- */
 public class OverviewToolTip extends ToolTip {
 
-	private final Overview overview;
+	private final String summary;
 
-	public OverviewToolTip(Control control, Overview overview) {
+	public OverviewToolTip(Control control, String summary) {
 
 		super(control, ToolTip.RECREATE, true);
-		if(overview == null) {
+		if(summary == null) {
 			throw new IllegalArgumentException();
 		}
-		this.overview = overview;
+		this.summary = summary;
 		setHideOnMouseDown(false); // required for links to work
 	}
 
 	@Override
 	protected Composite createToolTipContentArea(Event event, Composite parent) {
 
-		String summary = overview.getSummary();
 		Composite summaryContainer = new Composite(parent, SWT.NULL);
 		summaryContainer.setBackground(null);
 		GridLayoutFactory.fillDefaults().applyTo(summaryContainer);

openchrom/plugins/net.openchrom.installer.ui/src/net/openchrom/installer/ui/swt/OverviewToolTip.java

@@ -89,7 +89,6 @@
 import net.openchrom.installer.model.BundleDiscoveryStrategy;
 import net.openchrom.installer.model.DiscoveryCategory;
 import net.openchrom.installer.model.DiscoveryPlugin;
-import net.openchrom.installer.model.Overview;
 import net.openchrom.installer.model.PluginDescriptor;
 import net.openchrom.installer.model.PluginDescriptorKind;
 import net.openchrom.installer.model.PluginDiscovery;
@@ -457,7 +456,7 @@ public void focusGained(FocusEvent e) {
 				infoButton = new ToolItem(toolBar, SWT.PUSH);
 				infoButton.setImage(infoImage);
 				infoButton.setToolTipText("show overview");
-				hookTooltip(toolBar, infoButton, pluginContainer, nameLabel, plugin.getOverview());
+				hookTooltip(toolBar, infoButton, pluginContainer, nameLabel, plugin.getSummary());
 				GridDataFactory.fillDefaults().align(SWT.END, SWT.CENTER).applyTo(toolBar);
 			} else {
 				new Label(pluginContainer, SWT.NULL).setText(" "); //$NON-NLS-1$
@@ -616,7 +615,7 @@ private void createDiscoveryContents(Composite container) {
 						ToolItem infoButton = new ToolItem(toolBar, SWT.PUSH);
 						infoButton.setImage(infoImage);
 						infoButton.setToolTipText("Show Overview");
-						hookTooltip(toolBar, infoButton, categoryHeaderContainer, nameLabel, category.getOverview());
+						hookTooltip(toolBar, infoButton, categoryHeaderContainer, nameLabel, category.getSummary());
 						GridDataFactory.fillDefaults().align(SWT.END, SWT.CENTER).applyTo(toolBar);
 					} else {
 						new Label(categoryHeaderContainer, SWT.NULL).setText(" "); //$NON-NLS-1$
@@ -662,9 +661,9 @@ private void configureLook(Control control, Color background) {
 		control.setBackground(background);
 	}
 
-	private void hookTooltip(final Control tooltipControl, final ToolItem tipActivator, final Control exitControl, final Control titleControl, Overview overview) {
+	private void hookTooltip(final Control tooltipControl, final ToolItem tipActivator, final Control exitControl, final Control titleControl, String summary) {
 
-		final OverviewToolTip toolTip = new OverviewToolTip(tooltipControl, overview);
+		final OverviewToolTip toolTip = new OverviewToolTip(tooltipControl, summary);
 		Listener listener = event -> {
 
 			switch(event.type) {
@@ -732,7 +731,7 @@ private void hookRecursively(Control control, Listener listener) {
 
 	private boolean hasTooltip(final DiscoveryCategory category) {
 
-		return category.getOverview() != null && category.getOverview().getSummary() != null && category.getOverview().getSummary().length() > 0;
+		return category.getSummary() != null && category.getSummary().length() > 0;
 	}
 
 	/**
@@ -917,6 +916,6 @@ public void paintControl(PaintEvent e) {
 
 	private boolean hasTooltip(final DiscoveryPlugin plugin) {
 
-		return plugin.getOverview() != null && plugin.getOverview().getSummary() != null && !plugin.getOverview().getSummary().isEmpty();
+		return plugin.getSummary() != null && !plugin.getSummary().isEmpty();
 	}
 }

openchrom/plugins/net.openchrom.installer.ui/src/net/openchrom/installer/ui/wizards/PluginDiscoveryWizardMainPage.java

@@ -57,7 +57,6 @@
       <complexType>
          <sequence>
             <element ref="featureFilter" minOccurs="0" maxOccurs="unbounded"/>
-            <element ref="overview" minOccurs="0" maxOccurs="1"/>
          </sequence>
          <attribute name="kind" type="string" use="required">
             <annotation>
@@ -150,6 +149,23 @@
                </documentation>
             </annotation>
          </attribute>
+         <attribute name="url" type="string">
+            <annotation>
+               <documentation>
+                  An URL that points to a web page with more information relevant to the plugin or category.
+               </documentation>
+            </annotation>
+         </attribute>
+         <attribute name="summary" type="string">
+            <annotation>
+               <documentation>
+                  A description providing detailed information about the item.  Newlines can be used to format the text into multiple paragraphs if necessary.  Text must fit into an area 320x240, otherwise it will be truncated in the UI.  More lengthy descriptions can be provided on a  web page if required, see @url.
+               </documentation>
+               <appinfo>
+                  <meta.attribute translatable="true"/>
+               </appinfo>
+            </annotation>
+         </attribute>
       </complexType>
    </element>
 
@@ -160,10 +176,6 @@
          </documentation>
       </annotation>
       <complexType>
-         <sequence>
-            <element ref="overview" minOccurs="0" maxOccurs="1"/>
-            <element ref="group" minOccurs="0" maxOccurs="unbounded"/>
-         </sequence>
          <attribute name="id" type="string" use="required">
             <annotation>
                <documentation>
@@ -211,16 +223,6 @@
                </documentation>
             </annotation>
          </attribute>
-      </complexType>
-   </element>
-
-   <element name="overview">
-      <annotation>
-         <documentation>
-            An overview that provides more detailed information, which may include a summary, url and screenshot.
-         </documentation>
-      </annotation>
-      <complexType>
          <attribute name="summary" type="string">
             <annotation>
                <documentation>
@@ -261,23 +263,6 @@
       </complexType>
    </element>
 
-   <element name="group">
-      <annotation>
-         <documentation>
-            groups provide a way to anchor plugins in a grouping with other like entries.
-         </documentation>
-      </annotation>
-      <complexType>
-         <attribute name="id" type="string" use="required">
-            <annotation>
-               <documentation>
-                  An identifier that identifies the group.  Must be unique for a particular plugin category.
-               </documentation>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
    <annotation>
       <appinfo>
          <meta.section type="since"/>
@@ -287,15 +272,12 @@
       </documentation>
    </annotation>
 
-
-
-
    <annotation>
       <appinfo>
          <meta.section type="copyright"/>
       </appinfo>
       <documentation>
-         Copyright (c) 2023, 2024 Lablicate GmbH.
+         Copyright (c) 2023, 2026 Lablicate GmbH.
 All rights reserved. This program and the accompanying materials
 are made available under the terms of the Eclipse Public License v2.0
 which accompanies this distribution, and is available at

openchrom/plugins/net.openchrom.installer/schema/pluginDiscovery.exsd

@@ -12,14 +12,8 @@
  *******************************************************************************/
 package net.openchrom.installer.model;
 
-import java.util.ArrayList;
-import java.util.List;
-
 /**
  * a category of plugins, which is a way of organizing plugins in top-level groups.
- * 
- * @author David Green
- * @author Igor Burilo
  */
 public class PluginCategory {
 
@@ -28,8 +22,7 @@ public class PluginCategory {
 	protected String description;
 	protected String relevance;
 	protected String icon;
-	protected Overview overview;
-	protected List<Group> group = new ArrayList<>();
+	protected String summary;
 
 	/**
 	 * an id that uniquely identifies the category
@@ -43,7 +36,7 @@ public void setId(String id) {
 
 		this.id = id;
 	}
-
+	
 	/**
 	 * the name of the category, as it is displayed in the ui.
 	 */
@@ -94,24 +87,14 @@ public void setIcon(String icon) {
 		this.icon = icon;
 	}
 
-	public Overview getOverview() {
-
-		return overview;
-	}
-
-	public void setOverview(Overview overview) {
+	public String getSummary() {
 
-		this.overview = overview;
+		return summary;
 	}
 
-	public List<Group> getGroup() {
+	public void setSummary(String summary) {
 
-		return group;
-	}
-
-	public void setGroup(List<Group> group) {
-
-		this.group = group;
+		this.summary = summary;
 	}
 
 	public void validate() throws IllegalArgumentException {
@@ -125,6 +108,9 @@ public void validate() throws IllegalArgumentException {
 		if(icon != null && icon.trim().isEmpty()) {
 			throw new IllegalArgumentException("icon is set but empty");
 		}
+		if(summary != null && summary.trim().isEmpty()) {
+			throw new IllegalArgumentException("summary is set but empty");
+		}
 		if(relevance != null) {
 			try {
 				int r = Integer.parseInt(relevance, 10);
@@ -135,8 +121,5 @@ public void validate() throws IllegalArgumentException {
 				throw new IllegalArgumentException("relevance is not between 1 and 100");
 			}
 		}
-		for(Group groupItem : group) {
-			groupItem.validate();
-		}
 	}
 }